Merge pull request #3 from SmartArray/tests/ci

Merge with branch tests/ci

Author: SmartArray

.github/workflows/ci-coverage.yml

@@ -0,0 +1,59 @@
+name: 'Build and check'
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+        matrix:
+          os: [x86_64-linux-gnu]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache apt depencenies
+        uses: actions/cache@v2
+        id: cache-apt
+        with:
+          path: "~/apt-cache"
+          key: apt-cache
+
+      - name: Cache depends
+        id: cache-dependencies
+        uses: actions/cache@v2        
+        with:
+          path: depends/${{ matrix.os }}
+          key: ${{ matrix.os }}-${{ hashFiles('depends/packages/*.mk') }}
+          
+      - name: Install apt dependencies
+        env:
+          CACHE_HIT: ${{steps.cache-apt.outputs.cache-hit}}
+          DEPS: build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache
+        run: |
+          if [[ "$CACHE_HIT" == 'true' ]]; then
+            sudo cp --force --recursive ~/apt-cache/* /
+          else
+            sudo apt-get update && sudo apt-get install -yq $DEPS
+            mkdir -p ~/apt-cache
+            for dep in $DEPS; do
+                dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/apt-cache/
+            done
+          fi
+
+      - name: Build depends
+        if: steps.cache-dependencies.outputs.cache-hit != 'true' && steps.cache-apt.outputs.cache-hit != 'true'
+        run: cd depends/ && make -j4 HOST=${{matrix.os}}
+
+      - name: Auto generate
+        run: ./autogen.sh
+
+      - name: configure
+        run: ./configure --with-incompatible-bdb --prefix=`pwd`/depends/${{ matrix.os }}
+
+      - name: make
+        run: make -j4
+
+      - name: check
+        run: make check
+        

src/chainparams.cpp

@@ -218,14 +218,13 @@ class CMainParams : public CChainParams {
         assert(genesis.hashMerkleRoot == uint256S("0x72ddd9496b004221ed0557358846d9248ecd4c440ebd28ed901efc18757d0fad"));
 
         // Note that of those with the service bits flag, most only support a subset of possible options
-        vSeeds.emplace_back("seed1.digibyte.io");
-        vSeeds.emplace_back("seed2.digibyte.io");
-        vSeeds.emplace_back("seed3.digibyte.io");
-        vSeeds.emplace_back("seed.digibyte.io");
-        vSeeds.emplace_back("digihash.co");
-        vSeeds.emplace_back("digiexplorer.info");
-        vSeeds.emplace_back("seed.digibyteprojects.com");
-
+        vSeeds.emplace_back("seed.digibyte.org"); // Website collective
+        vSeeds.emplace_back("seed.digibyteservers.io"); // ChillingSilence
+	vSeeds.emplace_back("seed.digibyte.io"); // JaredTate
+	vSeeds.emplace_back("seed.digibyteblockchain.com"); // JS555
+	vSeeds.emplace_back("dnsseed.esotericizm.site"); // DigiContributor
+	vSeeds.emplace_back("seed.digibytefoundation.org"); // DigiByteFoundation
+	vSeeds.emplace_back("seed.digibyte.host"); // SashaD
 
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,30);
@@ -412,11 +411,8 @@ class CTestNetParams : public CChainParams {
         vFixedSeeds.clear();
         vSeeds.clear();
         // nodes with support for servicebits filtering should be at the top
-        vSeeds.emplace_back("seed1.digibyte.io");
-        vSeeds.emplace_back("seed2.digibyte.io");
-        vSeeds.emplace_back("seed3.digibyte.io");
-        vSeeds.emplace_back("testnet-seed.digibyteprojects.com");
-        vSeeds.emplace_back("testnet-1.us.digibyteservers.io");
+        vSeeds.emplace_back("seed.testnet-1.us.digibyteservers.io");
+        vSeeds.emplace_back("seed.testnetexplorer.digibyteservers.io");
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,126);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,140);
@@ -498,6 +494,8 @@ class CRegTestParams : public CChainParams {
         consensus.nLocalTargetAdjustment = 4; //target adjustment per algo
         consensus.nLocalDifficultyAdjustment = 4; //difficulty adjustment per algo
 
+        consensus.BIP65Height = 1351;
+        consensus.BIP66Height = 1251;
 
         // DigiByte Hard Fork Block Heights
         consensus.multiAlgoDiffChangeTarget = 145; // Block 145,000 MultiAlgo Hard Fork

src/qt/test/paymentrequestdata.h

@@ -443,24 +443,32 @@ d2hj739GDLz0b5KuJ2SG6VknMRQM976w/m2qlq0ccVGaaZ2zMIGfpzL3p6adwx/5\
 //
 const char* paymentrequest5_cert2_BASE64 =
 "\
-Egt4NTA5K3NoYTI1NhrQBArNBDCCAkkwggExoAMCAQICAQEwDQYJKoZIhvcNAQEL\
-BQAwITEfMB0GA1UEAwwWUGF5bWVudFJlcXVlc3QgVGVzdCBDQTAeFw0xNTAxMTEx\
-ODIxMDhaFw0yNTAxMDgxODIxMDhaMCExHzAdBgNVBAMMFlBheW1lbnRSZXF1ZXN0\
-IFRlc3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMsZqzkzeBGo+i2N\
-mUak3Ciodr1V7S062VOy7N0OQYNDQHYkgDFAUET7cEb5VJaHPv5m3ppTBpU9xBcf\
-wbHHUt4VjA+mhRmYrl1khjvZM+X8kEqvWn20BtcM9R6r0yIYec8UERDDHBleL/P8\
-RkxEnVLjYTV9zigCXfMsgYb3EQShAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJ\
-KoZIhvcNAQELBQADggEBABUJpl3QCqsoDSxAsQdV6zKT4VGV76AzoGj7etQsQY+r\
-+S26VfWh/fMobEzuxFChr0USgLJ6FoK78hAtoZvt1lrye9yqFv/ig3WLWsJKWHHb\
-3RT6oR03CIwZXFSUasi08QDVLxafwsU5OMcPLucF3a1lRL1ccYrNgVCCx1+X7Bos\
-tIgDGRQQ4AyoHTcfVd2hEGeUv7k14mOxFsAp6851yosHq9Q2kwmdH+rHEJbjof87\
-yyKLagc4owyXBZYkQmkeHWCNqnuRmO5vUsfVb0UUrkD64o7Th/NjwooA7SCiUXl6\
-dfygT1b7ggpx7GC+sP2DsIM47IAZ55drjqX5u2f+Ba0iTAoEdGVzdBIkCIDC9P+F\
-vt0DEhl2qRQErGqUUwSsaMpDvWIaGnJGNQqi8oisGLzcrKYFKhhUZXN0aW5nIGFt\
-b3VudCBvdmVyZmxvdyEqgAG8S7WEDUC6tCL6q2CTBjop/AitgEy31RL9IqYruytR\
-iEBFUrBDJZU+UEezGwr7/zoECjo5ZY3PmtZcM2sILNjyweJF6XVzGqTxUw6pN6sW\
-XR2T3Gy2LzRvhVA25QgGqpz0/juS2BtmNbsZPkN9gMMwKimgzc+PuCzmEKwPK9cQ\
-YQ==\
+CAESC3g1MDkrc2hhMjU2GrcGCrQGMIIDMDCCAhgCCQCXRVYW4JPfSzANBgkqhkiG9\
+w0BAQsFADBaMQswCQYDVQQGEwJkZTERMA8GA1UECgwIRGlnaUJ5dGUxFTATBgNVBA\
+MMDGRpZ2lieXRlLm9yZzEhMB8GCSqGSIb3DQEJARYSeW9zaGlAZGlnaWJ5dGUub3J\
+nMB4XDTIxMDQxODA1MDc1OVoXDTMxMDQxNjA1MDc1OVowWjELMAkGA1UEBhMCZGUx\
+ETAPBgNVBAoMCERpZ2lCeXRlMRUwEwYDVQQDDAxkaWdpYnl0ZS5vcmcxITAfBgkqh\
+kiG9w0BCQEWEnlvc2hpQGRpZ2lieXRlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADgg\
+EPADCCAQoCggEBAKDdbIvuq3jsfZGREzR9hLMbuDUgmYXHH66vL7r/vTjpAxYGoUb\
+WsCI7xNGPlIHULPl4dDgxQMznI5pNHa90NkeSEXjDXNG4940UZ3A/Z6vmO+ubx66h\
+RgxuoNc9eDxFXWnqOMPONELH72BJEWiDBLcpuKbw10pzi/YrjbrdO4Kmd8wxwCem/\
+cfPYFw+WWZt/9vozV5oSh7FI6BOjI6S/xPx06oOzv7hcIQu5OD8TBFUVZyzBFvQl3\
+nnaOGS4RaEyARf1aMCP9ra66kLJqDSEQo6maVEHzfHnA4XqFe9fKbaCPywJ1oQWo+\
+RQzmbTmWgrOgCqjb57cwpzADaEfappwcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA\
+imCG+NiOVB4Oy0aC7O/++PihG0XGThuvzWmmeNlXArG47l4GCUfa/9C0x0uEVQyQ4\
+UWuv1s3peJS++wbpOKMwGePidc+TlLPeo6M6seCuKHl1zk9LbwqxsJ/UsbZiOYxnG\
+Cfxzy1moZhyIETdoduJ2H8golUO6LqogGj/Pp/fGFRYvKHV24Sv0MB83clmfpGDJd\
+DRjJ/doXnpSGCR0e2EUyenN43vSOCuDZiH8t4Dienoom+qBj62+ve5ALTZhAcHK02\
+LdzBEau51vz/Nt60N93v+fqsT9LmFm8ZuEO0AcsEmDQApL+hvXGKiVjbeEF56JUEC\
+elowsYDNa7Cz0XKNiKXAQoEbWFpbhImCP///////////wESGXapFMXQ+hGDj4J0v9\
+nAthEsCLr94/JkiKwYz4TvgwYgz9L4oQYqLkEgcGF5bWVudCByZXF1ZXN0IGZyb20\
+gdGhlIERpZ2lCeXRlIE9mZmljaWFscy4yHGh0dHBzOi8vZGlnaWJ5dGUub3JnL3Bh\
+eW1lbnQ6DXsiZm9vIjoiYmFyIn0qgAIuTIVLuyK97Y0uNWg+Zyt9IcO+gievSeuBh\
+UUiFpSnGXqABQEgbZIVSM0/AI2Yifl1fxjf9fcwUto+cvDQfUDkQczW2ouPNB07+Z\
+bLHaHWGjk3KYCoZpJHScJle5cCyfZwzqezsiKhPtt2toyyfLIBsQ3m07TGdlSPWKN\
+f51/Ka4l3NxtLIx8c2kaKlMlb/3gh8Rh3FEwHAwZhVrOEjj21r5Se+1IlWT8oR8LO\
+PL+0TJqAvQED+zmxtCLEADnWvCLNrerghzSoDzBJSJdQL/9efeZPACszEw79sqKpg\
+lVDej8waw4ZZ7v2wNUm6kwG0fKpuHA1b88isyRQ6yLCOj4M\
 ";
 
 #endif // DIGIBYTE_QT_TEST_PAYMENTREQUESTDATA_H

src/qt/test/rpcnestedtests.cpp

@@ -76,7 +76,7 @@ void RPCNestedTests::rpcNestedTests()
     QVERIFY(result == result2);
 
     RPCConsole::RPCExecuteCommandLine(*node, result, "getblock(getbestblockhash())[tx][0]", &filtered);
-    QVERIFY(result == "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b");
+    QVERIFY(result == "72ddd9496b004221ed0557358846d9248ecd4c440ebd28ed901efc18757d0fad");
     QVERIFY(filtered == "getblock(getbestblockhash())[tx][0]");
 
     RPCConsole::RPCParseCommandLine(nullptr, result, "importprivkey", false, &filtered);

src/test/main_tests.cpp

@@ -46,6 +46,10 @@
     #define SECONDS_PER_MONTH (60 * 60 * 24 * 365 / 12)
 #endif    
 
+#ifndef ENABLE_TESTNET_SUBSIDY_TESTS
+    #define ENABLE_TESTNET_SUBSIDY_TESTS 0
+#endif
+
 BOOST_FIXTURE_TEST_SUITE(main_tests, TestingSetup)
 
 static void TestBlockSubsidy(const Consensus::Params& consensusParams, int nMaxBlocks, CAmount* nSumOut)
@@ -192,9 +196,8 @@ BOOST_AUTO_TEST_CASE(block_subsidy_test)
 #if OUTPUT_SUPPLY_SAMPLES_ENABLED
     // Output the accumulated supply until END_OF_SUPPLY_CURVE
     std::cout << "(mainnet): MAXIMUM SUPPLY: " << sum << " dgbSATS (" << (sum / COIN) << " DGB)";
-#else
-    // Only perform test on TESTNET too, if we are not
-    // outputting the sampled supply data.
+#elif ENABLE_TESTNET_SUBSIDY_TESTS != 0
+    // Only perform test on TESTNET too if requested so.
     TestBlockSubsidy(testChainParams->GetConsensus(), END_OF_SUPPLY_CURVE, NULL); // Testnet
 #endif
 }

src/test/txvalidationcache_tests.cpp

@@ -220,10 +220,10 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
     CBlock block;
 
     block = CreateAndProcessBlock({spend_tx}, p2pk_scriptPubKey);
+    LOCK(cs_main);
     BOOST_CHECK(chainActive.Tip()->GetBlockHash() == block.GetHash());
     BOOST_CHECK(pcoinsTip->GetBestBlock() == block.GetHash());
 
-    LOCK(cs_main);
 
     // Test P2SH: construct a transaction that is valid without P2SH, and
     // then test validity with P2SH.

test/util/data/digibyte-util-test.json

@@ -16,7 +16,7 @@
     "description": "Creates a blank transaction when nothing is piped into digibyte-tx"
   },
   { "exec": "./digibyte-tx",
-    "args": ["-json","-create"],
+    "args": ["-json","-create","nversion=2"],
     "output_cmp": "blanktxv2.json",
     "description": "Creates a blank transaction (output in json)"
   },
@@ -130,7 +130,7 @@
   { "exec": "./digibyte-tx",
     "args":
     ["-create",
-     "outaddr=1:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o:garbage"],
+     "outaddr=1:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44:garbage"],
     "return_code": 1,
     "error_txt": "error: TX output missing or too many separators",
     "description": "Malformed outaddr argument (too many separators). Expected to fail."
@@ -154,38 +154,40 @@
   { "exec": "./digibyte-tx",
     "args":
     ["-create",
+     "nversion=2",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "in=bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c:18",
      "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
-     "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44",
+     "outaddr=4:DQHjpVccQymF9g4zFsxZzf1fN2dRDF4Bdg"],
     "output_cmp": "txcreate1.hex",
     "description": "Creates a new transaction with three inputs and two outputs"
   },
   { "exec": "./digibyte-tx",
     "args":
     ["-json",
      "-create",
+     "nversion=2",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
      "in=bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c:18",
      "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
-     "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44",
+     "outaddr=4:DQHjpVccQymF9g4zFsxZzf1fN2dRDF4Bdg"],
     "output_cmp": "txcreate1.json",
     "description": "Creates a new transaction with three inputs and two outputs (output in json)"
   },
   { "exec": "./digibyte-tx",
-    "args": ["-create", "outscript=0:"],
+    "args": ["-create", "outscript=0:", "nversion=2"],
     "output_cmp": "txcreate2.hex",
     "description": "Creates a new transaction with a single empty output script"
   },
   { "exec": "./digibyte-tx",
-    "args": ["-json", "-create", "outscript=0:"],
+    "args": ["-json", "-create", "nversion=2", "outscript=0:"],
     "output_cmp": "txcreate2.json",
     "description": "Creates a new transaction with a single empty output script (output in json)"
   },
   { "exec": "./digibyte-tx",
-    "args": ["02000000000100000000000000000000000000"],
+    "args": ["02000000000100000000000000000000000000", "nversion=2"],
     "output_cmp": "txcreate2.hex",
     "description": "Parses a transaction with no inputs and a single output script"
   },
@@ -236,35 +238,36 @@
   },
   { "exec": "./digibyte-tx",
     "args":
-    ["-create", "nversion=1",
+    ["-create", 
      "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
      "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
      "sign=ALL",
-     "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
+     "outaddr=0.001:DRdFhX5DamBnxgF8rTiRdUwLjt3xHRFLe4"],
     "output_cmp": "txcreatesignv1.hex",
     "description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction"
   },
   { "exec": "./digibyte-tx",
     "args":
     ["-json",
-     "-create", "nversion=1",
+     "-create",
      "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
      "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
      "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
      "sign=ALL",
-     "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
+     "outaddr=0.001:DRdFhX5DamBnxgF8rTiRdUwLjt3xHRFLe4"],
     "output_cmp": "txcreatesignv1.json",
     "description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction (output in json)"
   },
   { "exec": "./digibyte-tx",
     "args":
     ["-create",
+      "nversion=2",
       "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
       "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
       "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
       "sign=ALL",
-      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
+      "outaddr=0.001:DRdFhX5DamBnxgF8rTiRdUwLjt3xHRFLe4"],
     "output_cmp": "txcreatesignv2.hex",
     "description": "Creates a new transaction with a single input and a single output, and then signs the transaction"
   },
@@ -275,7 +278,7 @@
       "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
       "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":\"0foo\",\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]",
       "sign=ALL",
-      "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
+      "outaddr=0.001:DRdFhX5DamBnxgF8rTiRdUwLjt3xHRFLe4"],
     "return_code": 1,
     "error_txt": "error: prevtxs internal object typecheck fail",
     "description": "Tests the check for invalid vout index in prevtxs for sign"
@@ -345,7 +348,7 @@
     "args":
     ["-create",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44",
      "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata1.hex",
     "description": "Creates a new transaction with one input, one address output and one data output"
@@ -355,16 +358,17 @@
     ["-json",
      "-create", "nversion=1",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44",
      "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata1.json",
     "description": "Creates a new v1 transaction with one input, one address output and one data output (output in json)"
   },
   { "exec": "./digibyte-tx",
     "args":
     ["-create",
+     "nversion=2",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44",
      "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata2.hex",
     "description": "Creates a new transaction with one input, one address output and one data (zero value) output"
@@ -373,26 +377,29 @@
     "args":
     ["-json",
      "-create",
+     "nversion=2",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44",
      "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"],
     "output_cmp": "txcreatedata2.json",
     "description": "Creates a new transaction with one input, one address output and one data (zero value) output (output in json)"
   },
   { "exec": "./digibyte-tx",
     "args":
     ["-create",
+     "nversion=2",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44"],
     "output_cmp": "txcreatedata_seq0.hex",
     "description": "Creates a new transaction with one input with sequence number and one address output"
   },
   { "exec": "./digibyte-tx",
     "args":
     ["-json",
      "-create",
+     "nversion=2",
      "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
-     "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"],
+     "outaddr=0.18:D78i9WxKZYWjM7JxDpwaBo7y7Shhovxq44"],
     "output_cmp": "txcreatedata_seq0.json",
     "description": "Creates a new transaction with one input with sequence number and one address output (output in json)"
   },
@@ -452,7 +459,7 @@
     "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH (output in json)"
   },
   { "exec": "./digibyte-tx",
-    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:047d1368ba7ae01c94bc32293efd70bd7e3be7aa7912d07d0b1c659c1008d179b8642f5fb90f47580feb29f045e216ff5a4716d3a0fed36da414d332046303c44a:S"],
+    "args": ["-json", "-create", "nversion=2", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:047d1368ba7ae01c94bc32293efd70bd7e3be7aa7912d07d0b1c659c1008d179b8642f5fb90f47580feb29f045e216ff5a4716d3a0fed36da414d332046303c44a:S"],
     "output_cmp": "txcreatemultisig5.json",
     "description": "Uncompressed pubkeys should work just fine for non-witness outputs"
   },