RavenProject · cfrogjump · Dec 12, 2018 · Jul 30, 2018 · Aug 3, 2018 · Aug 3, 2018
diff --git a/Makefile.am b/Makefile.am
@@ -22,6 +22,7 @@ RAVEND_BIN=$(top_builddir)/src/$(RAVEN_DAEMON_NAME)$(EXEEXT)
 RAVEN_QT_BIN=$(top_builddir)/src/qt/$(RAVEN_GUI_NAME)$(EXEEXT)
 RAVEN_CLI_BIN=$(top_builddir)/src/$(RAVEN_CLI_NAME)$(EXEEXT)
 RAVEN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
+RAVEN_CLI_INSTALL=$(top_builddir)/contrib/install_cli.sh
 
 empty :=
 space := $(empty) $(empty)
@@ -96,17 +97,30 @@ $(OSX_APP)/Contents/Resources/raven.icns: $(OSX_INSTALLER_ICONS)
 	$(MKDIR_P) $(@D)
 	$(INSTALL_DATA) $< $@
 
+$(OSX_APP)/Contents/MacOS/install_cli.sh: $(RAVEN_CLI_INSTALL)
+	$(MKDIR_P) $(@D)
+	$(INSTALL_DATA) $< $@
+
 $(OSX_APP)/Contents/MacOS/Raven-Qt: $(RAVEN_QT_BIN)
 	$(MKDIR_P) $(@D)
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
 
+$(OSX_APP)/Contents/MacOS/ravend: $(RAVEND_BIN)
+	$(MKDIR_P) $(@D)
+	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
+
+$(OSX_APP)/Contents/MacOS/raven-cli: $(RAVEN_CLI_BIN)
+	$(MKDIR_P) $(@D)
+	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
+
 $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
 	$(MKDIR_P) $(@D)
 	echo '{	CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@
 
 OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
   $(OSX_APP)/Contents/Resources/raven.icns $(OSX_APP)/Contents/Info.plist \
-  $(OSX_APP)/Contents/MacOS/Raven-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
+  $(OSX_APP)/Contents/MacOS/Raven-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings \
+  $(OSX_APP)/Contents/MacOS/ravend $(OSX_APP)/Contents/MacOS/raven-cli $(OSX_APP)/Contents/MacOS/install_cli.sh
 
 osx_volname:
 	echo $(OSX_VOLNAME) >$@

diff --git a/assets/asset_metadata_spec.md b/assets/asset_metadata_spec.md
@@ -16,12 +16,14 @@ Additional fields may be added, but will be ignored by Ravencoin.
    "symbol": "LEMONADE",
 
    "name": "Lemonade Gift",
-
+   
    "issuer": "Lemonade Stands, Inc.",
 
    "description": "This coin is worth one lemonade.",
 
    "description_mime": "text/x-markdown; charset=UTF-8",
+
+   "keywords": "Lemonade, Lemonade Stand, Gift, Cold Drink",
 
    "type": "Points",
 
@@ -68,6 +70,8 @@ All fields are optional. Clients, explorers, and wallets are not obligated to di
 
 **description_mime** - The mime type of the description.  This may or may not be honored, depending on the client, explorer, etc.
 
+**keywords** - helps describe an asset and allows it to be found easily Examples: "Lemonade, Cold Drink, Drinks" this will most likely be used by third party search engines. seperate keywords with commmas
+
 **type** - The type that the qty of the token represents.  Examples: (Tokens, Points, Shares, Tickets).  This may or may not be displayed by the client.
 
 **website_url** - The website for this token.  The client or software may or may not display this.

diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 2)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/contrib/install_cli.sh b/contrib/install_cli.sh
@@ -0,0 +1,13 @@
+ #!/usr/bin/env bash
+
+ # Execute this file to install the raven cli tools into your path on OS X
+
+ CURRENT_LOC="$( cd "$(dirname "$0")" ; pwd -P )"
+ LOCATION=${CURRENT_LOC%Raven-Qt.app*}
+
+ # Ensure that the directory to symlink to exists
+ sudo mkdir -p /usr/local/bin
+
+ # Create symlinks to the cli tools
+ sudo ln -s ${LOCATION}/Raven-Qt.app/Contents/MacOS/ravend /usr/local/bin/ravend
+ sudo ln -s ${LOCATION}/Raven-Qt.app/Contents/MacOS/raven-cli /usr/local/bin/raven-cli
diff --git a/doc/atomicswaps.md b/doc/atomicswaps.md
@@ -114,6 +114,9 @@ createrawtransaction '[{"txid":"631cf1566165803f0b89fbfb169d8f0c89129ec3f8536a48
 Ok, the structure of the transaction is set.  Now each party needs to sign it in order to unlock the inputs.  Here are the steps:
 
 * Andy signs it using `signrawtransaction`.  This will alter the hex, using his wallet to insert the signatures.
+
+> **Note:** Since Andy doesn't have the keys for all of the inputs he will see an error: `"Unable to sign input, invalid stack size (possibly missing key)" This is normal and expected.`
+
 * Andy sends the signed hex to Barb.
 * Barb uses `signrawtransaction` to sign the rest of the inputs.  Again capture the hex output.
 

diff --git a/roadmap/README.md b/roadmap/README.md
@@ -11,7 +11,7 @@ Ravencoin (RVN) is a Proof of Work coin built on the Bitcoin UTXO model. As with
 *  Network Port: 8767
 *  RPC Port: 8766
 
-### Phase 2 - Assets (in progress)
+### Phase 2 - Assets (Complete)
 
 #### ASIC Resistance
 
@@ -41,7 +41,7 @@ Asset transfers require the standard RVN transaction fees for transfer from one
 
 #### Metadata
 
-Metadata about the token can be stored in IPFS. Initially this cannot be changed. If there is a demand, the system can be updated to allow updating the metadata by the token issuer.
+Metadata about the token can be stored in IPFS.
 
 #### Rewards
 
@@ -51,13 +51,13 @@ Example: A small software company issues an asset GAMECO that represents a share
 
 #### Block Size
 
-Raven may increase the blocksize from 1 MB to X MB to allow for more on-chain transactions.
+Raven may increase the blocksize from 2 MB to X MB to allow for more on-chain transactions.
 
 ### Phase 3 - Rewards
 
 Rewards allow payment in RVN to asset holders.
 
-### Phase 4 - Unique Assets
+### Phase 4 - Unique Assets (Complete)
 
 Once created, assets can be made unique for a cost of 5 RVN. Only non-divisible assets can be made unique. This moves an asset to a UTXO and associates a unique identifier with the txid. From this point the asset can be moved from one address to another and can be traced back to its origin. Only the issuer of the original asset can make an asset unique.  
 The costs to make unique assets will be sent to a burn address.  
@@ -71,47 +71,43 @@ are unique tokens.
 
 ### Phase 5 - Messaging
 
-Messaging to token holders by authorized senders will be layered on top of the Phase 3 unique assets. See KAAAWWW Protocol for additional information.
+Messaging to token holders by authorized senders will be layered on top of the Phase 4 unique assets. See KAAAWWW Protocol for additional information.
 
 ### Phase 6 - Voting
 
 Voting will be accomplished by creating and distributing parallel tokens to token holders. These tokens can be sent to RVN addresses to record a vote.
 
+### Phase 7 - Compatibility Mode
+
+Allows newly created assets to appear exactly like RVN, LTC, or Bitcoin for easy integration into exchanges, wallets, explorers, etc.
+Speeds adoption into the larger crypto ecosystem.
+
 ### Appendix A - RPC commands for assets
 
-`issue(to_address, asset_name, qty, units=1, reissuable=false)`  
+`issue (asset_name, qty, to_address, change_address, units, reissuable, has_ipfs, ipfs_hash)`  
 Issue an asset with unique name. Unit as 1 for whole units, or 0.00000001 for satoshi-like units. Qty should be whole number. Reissuable is true/false for whether additional units can be issued by the
 original issuer.  
 
-`issuefrom(from_address, to_address, qty, units, units=1, reissuable=false)`  
-Issue an asset with unique name from a specific address -- allows control of which address/private_key is used to issue the asset. Unit as 1 for whole units, or 0.00000001 for satoshi-like units. Qty should be whole number. Reissuable is true/false for whether additional units can be issued by the original issuer.
-
-`issuemore(to_address, asset_name, qty)`  
-Issue more of a specific asset. This is only allowed by the original issuer of the asset and if the reissuable flag was set to true at the time of original issuance.  
-
-`makeuniqueasset(address, asset_name, unique_id)`  
+`issueunique (root_name, asset_tags, ipfs_hash, to_address, change_address) `  
 Creates a unique asset from a pool of assets with a specific name. Example: If the asset name is SOFTLICENSE, then this could make unique assets like SOFTLICENSE:38293 and SOFTLICENSE:48382 This would be called once per unique asset needed.  
 
-`listassets(assets=*, verbose=false, count=MAX, start=0)`  
-This lists assets that have already been created. It does not distinguish unique assets.  
-
-`listuniqueassets(asset)`  
-This lists the assets that have been made unique, and the address that owns the asset.  
-
-`sendasset(to_address, asset, amount)`  
-This sends assets from one asset holder to another.  
+`reissue (reissue asset_name, qty, to_address, change_address, reissuable, new_unit, new_ipfs )`
+Issue more of a specific asset. This is only allowed by the original issuer of the asset and if the reissuable flag was set to true at the time of original issuance.
 
-`sendassetfrom(from_address, to_address, asset, amount)`  
-This sends asset from one asset holder to another, but allows specifying which address to send from, so that if a wallet that has multiple addresses holding a given asset, the send can disambiguate the address from which to send.  
+`transfer (asset_name, qty, to_address)`  
+This sends assets from one asset holder to another.
 
-`getassettransaction(asset, txid)`  
-This returns details for a specific asset transaction.  
+`listassets (assets, verbose, count, start)`  
+This lists assets that have already been created. 
+
+`listmyassets ( asset_name, verbose, count, start )`
+Lists your assets.
 
-`listassettransactions(asset, verbose=false, count=100, start=0)`  
-This returns a list of transactions for a given asset.  
+`listassetbalancesbyaddress (address)`
+Lists asset balance by address.
 
-`reward(from_address, asset, amount, except=[])`  
-Sends RVN to holders of the the specified asset. The Raven is split pro-rata to holders of the asset. Any remainder that cannot be evenly divided to the satoshi (1/100,000,000 RVN) level will be added to the mining fee. except is a list of addresses to exclude from the distribution - used so that you could exclude treasury shares that do not participate in the reward.  
+`listaddressesbyasset (asset_name)` 
+Lists addresses by asset.
 
-`send_asset(from_address, from_asset, to_asset, amount, except=[])`  
-Sends an asset to holders of the the specified to_asset. This can be used to send a voting token to holders of an asset. Combined with a messaging protocol explaining the vote, it could act as a distributed voting system.
+`getassetdata (asset_name)`
+Lists asset data of an asset.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -125,6 +125,7 @@ QT_MOC_CPP = \
   qt/moc_askpassphrasedialog.cpp \
   qt/moc_assetcontroldialog.cpp \
   qt/moc_assetcontroltreewidget.cpp \
+  qt/moc_assetfilterproxy.cpp \
   qt/moc_bantablemodel.cpp \
   qt/moc_ravenaddressvalidator.cpp \
   qt/moc_ravenamountfield.cpp \
@@ -135,6 +136,7 @@ QT_MOC_CPP = \
   qt/moc_coincontroldialog.cpp \
   qt/moc_coincontroltreewidget.cpp \
   qt/moc_csvmodelwriter.cpp \
+  qt/moc_darkstyle.cpp \
   qt/moc_editaddressdialog.cpp \
   qt/moc_guiutil.cpp \
   qt/moc_intro.cpp \
@@ -201,6 +203,8 @@ RAVEN_QT_H = \
   qt/askpassphrasedialog.h \
   qt/assetcontroldialog.h \
   qt/assetcontroltreewidget.h \
+  qt/assetfilterproxy.h \
+  qt/assetrecord.h \
   qt/assetsdialog.h \
   qt/createassetdialog.h \
   qt/bantablemodel.h \
@@ -213,6 +217,7 @@ RAVEN_QT_H = \
   qt/coincontroldialog.h \
   qt/coincontroltreewidget.h \
   qt/csvmodelwriter.h \
+  qt/darkstyle.h \
   qt/editaddressdialog.h \
   qt/guiconstants.h \
   qt/guiutil.h \
@@ -263,6 +268,14 @@ RES_ICONS = \
   qt/res/icons/about.png \
   qt/res/icons/about_qt.png \
   qt/res/icons/asset_administrator.png \
+  qt/res/icons/asset_administrator_dark.png \
+  qt/res/icons/asset_create.png \
+  qt/res/icons/asset_create_selected.png \
+  qt/res/icons/asset_manage.png \
+  qt/res/icons/asset_manage_selected.png \
+  qt/res/icons/asset_transfer.png \
+  qt/res/icons/asset_transfer_selected.png \
+  qt/res/icons/ravencointext.png \
   qt/res/icons/raven.ico \
   qt/res/icons/raven_testnet.ico \
   qt/res/icons/raven.png \
@@ -292,18 +305,22 @@ RES_ICONS = \
   qt/res/icons/hd_disabled.png \
   qt/res/icons/hd_enabled.png \
   qt/res/icons/history.png \
+  qt/res/icons/history_selected.png \
   qt/res/icons/info.png \
   qt/res/icons/key.png \
   qt/res/icons/lock_closed.png \
   qt/res/icons/lock_open.png \
   qt/res/icons/network_disabled.png \
   qt/res/icons/open.png \
   qt/res/icons/overview.png \
+  qt/res/icons/overview_selected.png \
   qt/res/icons/quit.png \
   qt/res/icons/receive.png \
+  qt/res/icons/receive_selected.png \
   qt/res/icons/refresh.png \
   qt/res/icons/remove.png \
   qt/res/icons/send.png \
+  qt/res/icons/send_selected.png \
   qt/res/icons/synced.png \
   qt/res/icons/transaction0.png \
   qt/res/icons/transaction2.png \
@@ -316,7 +333,41 @@ RES_ICONS = \
   qt/res/icons/tx_asset_input.png \
   qt/res/icons/tx_asset_output.png \
   qt/res/icons/warning.png \
-  qt/res/icons/verify.png
+  qt/res/icons/verify.png \
+  qt/res/darkstyle/icon_close.png \
+  qt/res/darkstyle/icon_restore.png \
+  qt/res/darkstyle/icon_undock.png \
+  qt/res/darkstyle/icon_branch_closed.png \
+  qt/res/darkstyle/icon_branch_end.png \
+  qt/res/darkstyle/icon_branch_more.png \
+  qt/res/darkstyle/icon_branch_open.png \
+  qt/res/darkstyle/icon_vline.png \
+  qt/res/darkstyle/icon_checkbox_checked.png \
+  qt/res/darkstyle/icon_checkbox_indeterminate.png \
+  qt/res/darkstyle/icon_checkbox_unchecked.png \
+  qt/res/darkstyle/icon_checkbox_checked_pressed.png \
+  qt/res/darkstyle/icon_checkbox_indeterminate_pressed.png \
+  qt/res/darkstyle/icon_checkbox_unchecked_pressed.png \
+  qt/res/darkstyle/icon_checkbox_checked_disabled.png \
+  qt/res/darkstyle/icon_checkbox_indeterminate_disabled.png \
+  qt/res/darkstyle/icon_checkbox_unchecked_disabled.png \
+  qt/res/darkstyle/icon_radiobutton_checked.png \
+  qt/res/darkstyle/icon_radiobutton_unchecked.png \
+  qt/res/darkstyle/icon_radiobutton_checked_pressed.png \
+  qt/res/darkstyle/icon_radiobutton_unchecked_pressed.png \
+  qt/res/darkstyle/icon_radiobutton_checked_disabled.png \
+  qt/res/darkstyle/icon_radiobutton_unchecked_disabled.png \
+  qt/res/fonts/OpenSans-Bold.ttf \
+  qt/res/fonts/OpenSans-BoldItalic.ttf \
+  qt/res/fonts/OpenSans-ExtraBold.ttf \
+  qt/res/fonts/OpenSans-ExtraBoldItalic.ttf \
+  qt/res/fonts/OpenSans-Italic.ttf \
+  qt/res/fonts/OpenSans-Light.ttf \
+  qt/res/fonts/OpenSans-LightItalic.ttf \
+  qt/res/fonts/OpenSans-Regular.ttf \
+  qt/res/fonts/OpenSans-SemiBold.ttf \
+  qt/res/fonts/OpenSans-SemiBoldItalic.ttf
+
 
 RAVEN_QT_BASE_CPP = \
   qt/bantablemodel.cpp \
@@ -326,6 +377,7 @@ RAVEN_QT_BASE_CPP = \
   qt/ravenunits.cpp \
   qt/clientmodel.cpp \
   qt/csvmodelwriter.cpp \
+  qt/darkstyle.cpp \
   qt/guiutil.cpp \
   qt/intro.cpp \
   qt/modaloverlay.cpp \
@@ -351,6 +403,7 @@ RAVEN_QT_WALLET_CPP = \
   qt/askpassphrasedialog.cpp \
   qt/assetcontroldialog.cpp \
   qt/assetcontroltreewidget.cpp \
+  qt/assetfilterproxy.cpp \
   qt/assetsdialog.cpp \
   qt/createassetdialog.cpp \
   qt/coincontroldialog.cpp \