[WIP] 3.3 PR consolidation and fixes

.github/scripts/05-binary-checks.sh

@@ -3,6 +3,8 @@
 OS=${1}
 GITHUB_WORKSPACE=${2}
 
+export BOOST_TEST_LOG_LEVEL=error
+
 if [[ ${OS} == "windows" ]]; then
     echo "----------------------------------------"
     echo "Checking binary security for ${OS}"

.github/scripts/06-package.sh

@@ -4,6 +4,10 @@ OS=${1}
 GITHUB_WORKSPACE=${2}
 GITHUB_BASE_REF=${3}
 
+echo "----------------------------------------"
+env
+echo "----------------------------------------"
+
 if [[ ! ${OS} || ! ${GITHUB_WORKSPACE} || ! ${GITHUB_BASE_REF} ]]; then
     echo "Error: Invalid options"
     echo "Usage: ${0} <operating system> <github workspace path> <github base ref>"
@@ -28,10 +32,6 @@ if [[ ! -e ${RELEASE_LOCATION} ]]; then
     mkdir -p ${RELEASE_LOCATION}
 fi
 
-echo "----------------------------------------"
-env
-echo "----------------------------------------"
-
 echo "----------------------------------------"
 echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}"
 echo "----------------------------------------"

.github/workflows/build-raven.yml

@@ -2,8 +2,8 @@ name: Build Raven
 
 on:
   push:
-    tags:
-      - v*
+    branches:
+      - release*
   pull_request:
     branches:
       - develop
@@ -15,8 +15,7 @@ on:
       - 'whitepaper/**'
       - 'binaries/**'
       - 'contrib/**'
-    tags:
-      - v*
+
 env:
   SCRIPTS: ${{ GITHUB.WORKSPACE }}/.github/scripts
   AWS_S3_ENABLE: ${{ secrets.AWS_S3_ENABLE }}
@@ -55,7 +54,7 @@ jobs:
       run: ${SCRIPTS}/05-binary-checks.sh ${{ MATRIX.OS }} ${{ GITHUB.WORKSPACE }}
 
     - name: Package Up the Build
-      run: ${SCRIPTS}/06-package.sh ${{ MATRIX.OS }} ${{ GITHUB.WORKSPACE }} ${{ GITHUB.BASE_REF }}
+      run: ${SCRIPTS}/06-package.sh ${{ MATRIX.OS }} ${{ GITHUB.WORKSPACE }} ${{ GITHUB.BASE_REF }} ${{ GITHUB.REF }}
 
     - name: Upload Build to the Nightly Site
       if: env.AWS_S3_ENABLE == 'true'

Makefile.am

@@ -292,6 +292,21 @@ CLEANFILES = $(OSX_DMG) $(RAVEN_WIN_INSTALLER)
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-man
 
-clean-local:
+doc/doxygen/.stamp: doc/Doxyfile FORCE
+	$(MKDIR_P) $(@D)
+	$(DOXYGEN) $^
+	$(AM_V_at) touch $@
+
+if HAVE_DOXYGEN
+docs: doc/doxygen/.stamp
+else
+docs:
+	@echo "error: doxygen not found"
+endif
+
+clean-docs:
+	rm -rf doc/doxygen
+
+clean-local: clean-docs
 	rm -rf coverage_percent.txt test_raven.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
 	rm -rf test/functional/__pycache__

assets/tools/vanity_address_gen.py

@@ -0,0 +1,89 @@
+from ravenrpc import Ravencoin # pip install ravenrpc
+import sys
+import os
+import time
+
+# Requires ravenrpc==0.2.4
+#
+# usage:
+# ```
+# python vanity_address_gen.py ( rpcuser ) ( rpcpass ) ( prefix ) ( ignore_case=True )
+# ```
+
+
+
+def valid_base58(s):
+    for c in ('0', 'O', 'l', '1'):
+        if c in s:
+            print(f'Cannot use charachter "{c}" in prefix!!')
+            exit()
+
+def success_odds(prefix, ignore_case):
+    odds = 1
+    for letter in prefix[1:]:
+        if letter in ('o', 'l') or not ignore_case:
+            odds *= 58
+        else:
+            odds *= 29
+    return odds
+
+def create_rvn_inst():
+    try:
+        rvn = Ravencoin(sys.argv[1], sys.argv[2])
+    except IndexError:
+        print('You must provide a valid rpc username and rpc password!')
+        exit()
+    return rvn
+
+def get_args():
+    try:
+        prefix = sys.argv[3]
+    except IndexError:
+        print('Missing options!\n'
+            'Usage: `python gen.py <rpcuser> <rpcpass> <prefix> <ignore case (default True)>`')
+        exit()
+    ignore_case = sys.argv[4] if len(sys.argv) > 4 else True
+    if prefix[0] != 'R':
+        print('Please start your prefix with an "R"\n'
+            'Usage: `python gen.py <rpcuser> <rpcpass> <prefix> <ignore case (default True)>`')
+        exit()
+    return prefix, ignore_case, create_rvn_inst()
+
+def validate_rvn(rvn):
+    if rvn.getinfo() == '':
+        print('Run ravend')
+        exit()
+
+def display_stats(count, start, addr, prefix, odds):
+    addr_sec = count/(time.time() - start)
+    os.system('cls' if os.name == 'nt' else 'clear')
+    print(f'Tried {count} addresses\n'
+          f'Seconds Spent: {time.time() - start}\n'
+          f'Ave. Addresses/sec: {addr_sec}\n'
+          f'Lastest Address: {addr}\n'
+          f'Prefix: {prefix}\n'
+          f'You have a 1 in {odds} chance per address!\n'
+          f'At this rate, you will find your address in ~{odds/addr_sec/60} minutes!\n'
+          'To stop, press Ctrl-C', flush=True, end='')
+
+
+def main():
+    prefix, ignore_case, rvn = get_args()
+    validate_rvn(rvn)
+    valid_base58(prefix)
+    start = time.time()
+    odds = success_odds(prefix, ignore_case)
+    count = 0
+    address = rvn.getnewaddress()['result']
+    try:
+        while not address.lower().startswith(prefix.lower()) if ignore_case else address.startswith(prefix):
+            address = rvn.getnewaddress()['result']
+            count += 1
+            if count % 100 == 1:
+                display_stats(count, start, address, prefix, odds)
+    except KeyboardInterrupt:
+        exit()
+    print(f'\nFound an address that starts with {prefix}!\n It is saved to your wallet. Use it freely!\n{address}')
+
+if __name__ == '__main__':
+    main()

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 3)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
@@ -94,6 +94,12 @@ AC_PATH_TOOL(READELF, readelf)
 AC_PATH_TOOL(CPPFILT, c++filt)
 AC_PATH_TOOL(OBJCOPY, objcopy)
 
+AC_PATH_PROG(DOXYGEN, doxygen)
+if test -z "$DOXYGEN"; then
+   AC_MSG_WARN([Doxygen not found])
+fi
+AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+
 AC_ARG_VAR(PYTHONPATH, Augments the default search path for python module files)
 
 # Enable wallet
@@ -1242,7 +1248,7 @@ AC_SUBST(PROTOBUF_LIBS)
 AC_SUBST(QR_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
-AC_CONFIG_FILES([doc/Doxyfile])
+AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
 AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
 AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
 AC_CONFIG_LINKS([test/util/raven-util-test.py:test/util/raven-util-test.py])

contrib/linearize/example-linearize.cfg

@@ -19,8 +19,8 @@ max_height=313000
 # bootstrap.dat input/output settings (linearize-data)
 
 # mainnet
-netmagic=f9beb4d9
-genesis=000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
+netmagic=43524f57
+genesis=0b2c703dc93bb63a36c4e33b85be4855ddbca2ac951a7a0a29b8de0408200a3c
 input=/home/example/.raven/blocks
 
 # testnet

contrib/linearize/linearize-data.py

@@ -13,8 +13,8 @@
 import re
 import os
 import os.path
+import subprocess
 import sys
-import hashlib
 import datetime
 import time
 from collections import namedtuple
@@ -49,23 +49,11 @@ def wordreverse(in_buf):
 	out_words.reverse()
 	return b''.join(out_words)
 
-def calc_hdr_hash(blk_hdr):
-	hash1 = hashlib.sha256()
-	hash1.update(blk_hdr)
-	hash1_o = hash1.digest()
-
-	hash2 = hashlib.sha256()
-	hash2.update(hash1_o)
-	hash2_o = hash2.digest()
-
-	return hash2_o
-
 def calc_hash_str(blk_hdr):
-	hash = calc_hdr_hash(blk_hdr)
-	hash = bufreverse(hash)
-	hash = wordreverse(hash)
-	hash_str = hexlify(hash).decode('utf-8')
-	return hash_str
+	x16r_hash_cmd = os.path.dirname(os.path.realpath(__file__)) + "/../../src/test/test_raven_hash"
+	cmd = [x16r_hash_cmd, hexlify(blk_hdr).decode('utf-8'), "2"]
+	blk_hash = subprocess.run(cmd, stdout=subprocess.PIPE, check=True).stdout.decode('ascii')
+	return blk_hash
 
 def get_blk_dt(blk_hdr):
 	members = struct.unpack("<I", blk_hdr[68:68+4])
@@ -216,7 +204,7 @@ def run(self):
 
 			inMagic = inhdr[:4]
 			if (inMagic != self.settings['netmagic']):
-				print("Invalid magic: " + hexlify(inMagic).decode('utf-8'))
+				print("Invalid magic: " + hexlify(inMagic).decode('utf-8') + " (" + str(inMagic) + ")")
 				return
 			inLenLE = inhdr[4:]
 			su = struct.unpack("<I", inLenLE)
@@ -228,8 +216,7 @@ def run(self):
 			if not self.hash_str in blkmap:
 				# Because blocks can be written to files out-of-order as of 0.10, the script
 				# may encounter blocks it doesn't know about. Treat as debug output.
-				if settings['debug_output'] == 'true':
-					print("Skipping unknown block " + self.hash_str)
+				print("Skipping unknown block " + self.hash_str)
 				self.inF.seek(inLen, os.SEEK_CUR)
 				continue
 
@@ -284,9 +271,9 @@ def run(self):
 	settings['rev_hash_bytes'] = settings['rev_hash_bytes'].lower()
 
 	if 'netmagic' not in settings:
-		settings['netmagic'] = 'f9beb4d9'
+		settings['netmagic'] = '43524f57'
 	if 'genesis' not in settings:
-		settings['genesis'] = '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f'
+		settings['genesis'] = '0b2c703dc93bb63a36c4e33b85be4855ddbca2ac951a7a0a29b8de0408200a3c'
 	if 'input' not in settings:
 		settings['input'] = 'input'
 	if 'hashlist' not in settings:

doc/developer-notes.md

@@ -129,9 +129,21 @@ Not OK (used plenty in the current source, but not picked up):
 //
 ```
 
-A full list of comment syntaxes picked up by doxygen can be found at http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html,
+A full list of comment syntaxes picked up by doxygen can be found at
+http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html,
 but if possible use one of the above styles.
 
+The Ravencoin Doxygen documentation can be generated by running `make docs` from the top-level 
+directory of the repository.
+That creates the documentation in the directory "doc/doxygen" and the it can be accessed by a browser at:
+    doc/doxygen/html/index.html    
+The documentation can by deleted by running `make clean-docs`.
+
+Before running `make docs`, you will need to install dependencies `doxygen` and `dot` (a component 
+of `graphviz`). For example, 
+    on MacOS via Homebrew: `brew install doxygen --with-graphviz`
+    on Debian/Ubuntu: `sudo install doxygen graphviz`
+
 Development tips and tricks
 ---------------------------
 

src/assets/assets.cpp

@@ -205,6 +205,11 @@ bool IsAssetNameASubQualifier(const std::string& name)
 
 bool IsAssetNameValid(const std::string& name, AssetType& assetType, std::string& error)
 {
+    // Do a max length check first to stop the possibility of a stack exhaustion.
+    // We check for a value that is larger than the max asset name
+    if (name.length() > 40)
+        return false;
+
     assetType = AssetType::INVALID;
     if (std::regex_match(name, UNIQUE_INDICATOR))
     {
@@ -900,6 +905,14 @@ bool AssetNullVerifierDataFromScript(const CScript& scriptPubKey, CNullAssetTxVe
 //! Call VerifyNewAsset if this function returns true
 bool CTransaction::IsNewAsset() const
 {
+    // New Asset transaction will always have at least three outputs.
+    // 1. Owner Token output
+    // 2. Issue Asset output
+    // 3. RVN Burn Fee
+    if (vout.size() < 3) {
+        return false;
+    }
+
     // Check for the assets data CTxOut. This will always be the last output in the transaction
     if (!CheckIssueDataTx(vout[vout.size() - 1]))
         return false;
@@ -5292,10 +5305,6 @@ bool CheckNewAsset(const CNewAsset& asset, std::string& strError)
         }
     }
 
-    if (assetType == AssetType::RESTRICTED) {
-        // TODO add more restricted asset checks
-    }
-
     if (IsAssetNameAnOwner(std::string(asset.strName))) {
         strError = _("Invalid parameters: asset_name can't have a '!' at the end of it. See help for more details.");
         return false;

src/assets/rewards.cpp

@@ -248,7 +248,6 @@ bool BuildTransaction(
         const std::vector<OwnerAndAmount> & p_pendingPayments,const int& start,
         std::string& change_address, uint256& retTxid)
 {
-    bool fcnRetVal = false;
     int expectedCount = 0;
     int actualCount = 0;
     CValidationState state;
@@ -285,7 +284,7 @@ bool BuildTransaction(
         std::vector<CRecipient> vDestinations;
 
         //  This should (due to external logic) only include pending payments
-        for (int i = start; i < p_pendingPayments.size() && i < stop; i++) {
+        for (int i = start; i < (int)p_pendingPayments.size() && i < stop; i++) {
             expectedCount++;
 
             // Parse Raven address (already validated during ownership snapshot creation)
@@ -343,7 +342,7 @@ bool BuildTransaction(
         GetMyAssetBalance(p_rewardSnapshot.strDistributionAsset, totalAssetBalance, 0);
 
         //  This should (due to external logic) only include pending payments
-        for (int i = start; i < p_pendingPayments.size() && i < stop; i++) {
+        for (int i = start; i < (int)p_pendingPayments.size() && i < stop; i++) {
             expectedCount++;
 
             vDestinations.emplace_back(std::make_pair(