Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/pull-tester/rpc-tests.sh

@@ -11,10 +11,15 @@ export BITCOIND=${REAL_BITCOIND}
 #Run the tests
 
 testScripts=(
+    'paymentdisclosure.py'
     'prioritisetransaction.py'
     'wallet_treestate.py'
+    'wallet_anchorfork.py'
     'wallet_protectcoinbase.py'
+    'wallet_shieldcoinbase.py'
+    'wallet_mergetoaddress.py'
     'wallet.py'
+    'wallet_overwintertx.py'
     'wallet_nullifiers.py'
     'wallet_1941.py'
     'listtransactions.py'
@@ -25,7 +30,10 @@ testScripts=(
     'rawtransactions.py'
     'rest.py'
     'mempool_spendcoinbase.py'
-    'mempool_coinbase_spends.py'
+    'mempool_reorg.py'
+    'mempool_tx_input_limit.py'
+    'mempool_nu_activation.py'
+    'mempool_tx_expiry.py'
     'httpbasics.py'
     'zapwallettxes.py'
     'proxy_test.py'
@@ -33,17 +41,21 @@ testScripts=(
     'fundrawtransaction.py'
     'signrawtransactions.py'
     'walletbackup.py'
+    'key_import_export.py'
     'nodehandling.py'
     'reindex.py'
     'decodescript.py'
     'disablewallet.py'
     'zcjoinsplit.py'
     'zcjoinsplitdoublespend.py'
+    'zkey_import_export.py'
+    'reorg_limit.py'
     'getblocktemplate.py'
+    'bip65-cltv-p2p.py'
+    'bipdersig-p2p.py'
+    'overwinter_peer_management.py'
 );
 testScriptsExt=(
-    'bipdersig-p2p.py'
-    'bipdersig.py'
     'getblocktemplate_longpoll.py'
     'getblocktemplate_proposals.py'
     'pruning.py'
@@ -65,6 +77,10 @@ if [ "x$ENABLE_ZMQ" = "x1" ]; then
   testScripts+=('zmq_test.py')
 fi
 
+if [ "x$ENABLE_PROTON" = "x1" ]; then
+  testScripts+=('proton_test.py')
+fi
+
 extArg="-extended"
 passOn=${@#$extArg}
 
@@ -78,7 +94,7 @@ function runTestScript
 
     echo -e "=== Running testscript ${testName} ==="
 
-    if eval "$@" | sed 's/^/  /'
+    if eval "$@"
     then
         successCount=$(expr $successCount + 1)
         echo "--- Success: ${testName} ---"

qa/pull-tester/tests-config.sh.in

@@ -11,6 +11,7 @@ EXEEXT="@EXEEXT@"
 @BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
 @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1
+@ENABLE_PROTON_TRUE@ENABLE_PROTON=1
 
 REAL_BITCOIND="$BUILDDIR/src/zcashd${EXEEXT}"
 REAL_BITCOINCLI="$BUILDDIR/src/zcash-cli${EXEEXT}"