diff --git a/src/chainparams.cpp b/src/chainparams.cpp --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -203,7 +203,7 @@ base58Prefixes[SECRET_KEY] = std::vector(1, 128); base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x88, 0xB2, 0x1E}; base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x88, 0xAD, 0xE4}; - cashaddrPrefix = "bitcoincash"; + cashaddrPrefix = "ecash"; vFixedSeeds = std::vector( pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main)); @@ -350,7 +350,8 @@ base58Prefixes[SECRET_KEY] = std::vector(1, 239); base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF}; base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94}; - cashaddrPrefix = "bchtest"; + cashaddrPrefix = "ectest"; + vFixedSeeds = std::vector( pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test)); @@ -481,7 +482,7 @@ base58Prefixes[SECRET_KEY] = std::vector(1, 239); base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF}; base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94}; - cashaddrPrefix = "bchreg"; + cashaddrPrefix = "ecregtest"; } }; diff --git a/src/minerfund.cpp b/src/minerfund.cpp --- a/src/minerfund.cpp +++ b/src/minerfund.cpp @@ -26,7 +26,7 @@ static const CTxDestination &GetMinerFundDestination() { static CTxDestination dest = - BuildDestination("pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdgnlxww9j9"); + BuildDestination("ecash:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdg2jj94l5j"); return dest; } diff --git a/src/qt/test/bitcoinaddressvalidatortests.cpp b/src/qt/test/bitcoinaddressvalidatortests.cpp --- a/src/qt/test/bitcoinaddressvalidatortests.cpp +++ b/src/qt/test/bitcoinaddressvalidatortests.cpp @@ -23,31 +23,31 @@ // invalid base58 because of I, invalid cashaddr, currently considered valid // anyway. - in = "BIIC"; + in = "ICASH"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, invalid cashaddr, currently considered valid anyway. - in = "BITCOINCASHH"; + in = "EOASH"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58 because of I, but could be a cashaddr prefix - in = "BITC"; + in = "ECASI"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, valid cashaddr - in = "BITCOINCASH:QP"; + in = "ECASH:OP"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, valid cashaddr, lower case - in = "bitcoincash:qp"; + in = "ecash:op"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, valid cashaddr, mixed case - in = "bItCoInCaSh:Qp"; + in = "eCash:Op"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // valid base58, invalid cash - in = "BBBBBBBBBBBBBB"; + in = "EEEEEEEEEEEEEE"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // Only alphanumeric chars are accepted. diff --git a/src/qt/test/guiutiltests.cpp b/src/qt/test/guiutiltests.cpp --- a/src/qt/test/guiutiltests.cpp +++ b/src/qt/test/guiutiltests.cpp @@ -43,7 +43,8 @@ QVERIFY(GUIUtil::convertToCashAddr(params, "garbage") == "garbage"); QString cashaddr_pubkey = - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a"; + "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2"; + QString base58_pubkey = "1BpEi6DfDAUFd7GtittLSdBeYJvcoaVggu"; QVERIFY(GUIUtil::convertToCashAddr(params, cashaddr_pubkey) == diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -18,83 +18,82 @@ SendCoinsRecipient rv; QUrl uri; QString scheme = QString::fromStdString(params->CashAddrPrefix()); - uri.setUrl(QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?" + uri.setUrl(QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?" "req-dontexist=")); QVERIFY(!GUIUtil::parseBitcoinURI(scheme, uri, &rv)); - uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?dontexist=")); + uri.setUrl( + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?dontexist=")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == Amount::zero()); - uri.setUrl( - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?label=" - "Wikipedia Example Address")); + uri.setUrl(QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?label=" + "Wikipedia Example Address")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.label == QString("Wikipedia Example Address")); QVERIFY(rv.amount == Amount::zero()); uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?amount=0.001")); + "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?amount=0.001")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 100000 * SATOSHI); uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?amount=1.001")); + "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?amount=1.001")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 100100000 * SATOSHI); - uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?amount=100&" - "label=Wikipedia Example")); + uri.setUrl( + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?amount=100&" + "label=Wikipedia Example")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.amount == int64_t(10000000000) * SATOSHI); QVERIFY(rv.label == QString("Wikipedia Example")); - uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?message=" - "Wikipedia Example Address")); + uri.setUrl( + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?message=" + "Wikipedia Example Address")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.label == QString()); QVERIFY( GUIUtil::parseBitcoinURI(scheme, - "bitcoincash://" - "qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?" + "ecash://" + "qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?" "message=Wikipedia Example Address", &rv)); QVERIFY(rv.address == - QString("bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a")); + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2")); QVERIFY(rv.label == QString()); - uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?req-message=" - "Wikipedia Example Address")); + uri.setUrl( + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?req-message=" + "Wikipedia Example Address")); QVERIFY(GUIUtil::parseBitcoinURI(scheme, uri, &rv)); - uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?amount=1," - "000&label=Wikipedia Example")); + uri.setUrl( + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?amount=1," + "000&label=Wikipedia Example")); QVERIFY(!GUIUtil::parseBitcoinURI(scheme, uri, &rv)); - uri.setUrl(QString( - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?amount=1," - "000.0&label=Wikipedia Example")); + uri.setUrl( + QString("ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?amount=1," + "000.0&label=Wikipedia Example")); QVERIFY(!GUIUtil::parseBitcoinURI(scheme, uri, &rv)); } @@ -103,10 +102,10 @@ { SendCoinsRecipient r; - r.address = "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a"; + r.address = "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2"; r.message = "test"; QString uri = GUIUtil::formatBitcoinURI(*params, r); - QVERIFY(uri == "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?" + QVERIFY(uri == "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2?" "message=test"); } @@ -125,7 +124,7 @@ r.address = "12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX"; r.message = "test"; QString uri = GUIUtil::formatBitcoinURI(*params, r); - QVERIFY(uri == "bitcoincash:qqgekzvw96vq5g57zwdfa5q6g609rrn0ycp33uc325?" + QVERIFY(uri == "ecash:qqgekzvw96vq5g57zwdfa5q6g609rrn0yccu9hrtvr?" "message=test"); } } diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -224,7 +224,7 @@ QString paymentText = rlist->toPlainText(); QStringList paymentTextList = paymentText.split('\n'); QCOMPARE(paymentTextList.at(0), QString("Payment information")); - QVERIFY(paymentTextList.at(1).indexOf(QString("URI: bchreg:")) != + QVERIFY(paymentTextList.at(1).indexOf(QString("URI: ecregtest:")) != -1); QVERIFY(paymentTextList.at(2).indexOf(QString("Address:")) != -1); QCOMPARE(paymentTextList.at(3), diff --git a/src/test/cashaddrenc_tests.cpp b/src/test/cashaddrenc_tests.cpp --- a/src/test/cashaddrenc_tests.cpp +++ b/src/test/cashaddrenc_tests.cpp @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(encode_decode_all_sizes) { FastRandomContext rand(true); - const std::string prefix = "bitcoincash"; + const std::string CASHADDR_PREFIX = "ecash"; for (auto ps : valid_sizes) { std::vector data = @@ -79,10 +79,11 @@ // Check that the packed size is correct BOOST_CHECK_EQUAL(packed_data[1] >> 2, ps.first); - std::string address = cashaddr::Encode(prefix, packed_data); + std::string address = cashaddr::Encode(CASHADDR_PREFIX, packed_data); // Check that the address decodes properly - CashAddrContent decoded = DecodeCashAddrContent(address, prefix); + CashAddrContent decoded = + DecodeCashAddrContent(address, CASHADDR_PREFIX); BOOST_CHECK_EQUAL_COLLECTIONS( std::begin(content.hash), std::end(content.hash), std::begin(decoded.hash), std::end(decoded.hash)); @@ -225,19 +226,19 @@ */ BOOST_AUTO_TEST_CASE(check_size) { const CTxDestination nodst = CNoDestination{}; - const std::string prefix = "bitcoincash"; + const std::string prefix = "ecash"; std::vector data; for (auto ps : valid_sizes) { - // Number of bytes required for a 5-bit packed version of a hash, with - // version byte. Add half a byte(4) so integer math provides the next - // multiple-of-5 that would fit all the data. + // Number of bytes required for a 5-bit packed version of a hash, + // with version byte. Add half a byte(4) so integer math provides + // the next multiple-of-5 that would fit all the data. size_t expectedSize = (8 * (1 + ps.second) + 4) / 5; data.resize(expectedSize); std::fill(begin(data), end(data), 0); - // After conversion from 8 bit packing to 5 bit packing, the size will - // be in the second 5-bit group, shifted left twice. + // After conversion from 8 bit packing to 5 bit packing, the size + // will be in the second 5-bit group, shifted left twice. data[1] = ps.first << 2; auto content = @@ -273,27 +274,26 @@ 213, 62, 197, 251, 195, 180, 45, 248, 237, 16}}; std::vector pubkey = { - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a", - "bitcoincash:qr95sy3j9xwd2ap32xkykttr4cvcu7as4y0qverfuy", - "bitcoincash:qqq3728yw0y47sqn6l2na30mcw6zm78dzqre909m2r"}; + "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2", + "ecash:qr95sy3j9xwd2ap32xkykttr4cvcu7as4ykdcjcn6n", + "ecash:qqq3728yw0y47sqn6l2na30mcw6zm78dzq653y7pv5"}; std::vector script = { - "bitcoincash:ppm2qsznhks23z7629mms6s4cwef74vcwvn0h829pq", - "bitcoincash:pr95sy3j9xwd2ap32xkykttr4cvcu7as4yc93ky28e", - "bitcoincash:pqq3728yw0y47sqn6l2na30mcw6zm78dzq5ucqzc37"}; + "ecash:ppm2qsznhks23z7629mms6s4cwef74vcwv2zrv3l8h", + "ecash:pr95sy3j9xwd2ap32xkykttr4cvcu7as4ypg9alspw", + "ecash:pqq3728yw0y47sqn6l2na30mcw6zm78dzqd3vtezhf"}; for (size_t i = 0; i < hash.size(); ++i) { const CTxDestination dstKey = PKHash(uint160(hash[i])); BOOST_CHECK_EQUAL(pubkey[i], EncodeCashAddr(dstKey, *params)); CashAddrContent keyContent{PUBKEY_TYPE, hash[i]}; - BOOST_CHECK_EQUAL(pubkey[i], EncodeCashAddr("bitcoincash", keyContent)); + BOOST_CHECK_EQUAL(pubkey[i], EncodeCashAddr("ecash", keyContent)); const CTxDestination dstScript = ScriptHash(uint160(hash[i])); BOOST_CHECK_EQUAL(script[i], EncodeCashAddr(dstScript, *params)); CashAddrContent scriptContent{SCRIPT_TYPE, hash[i]}; - BOOST_CHECK_EQUAL(script[i], - EncodeCashAddr("bitcoincash", scriptContent)); + BOOST_CHECK_EQUAL(script[i], EncodeCashAddr("ecash", scriptContent)); } } diff --git a/src/test/dstencode_tests.cpp b/src/test/dstencode_tests.cpp --- a/src/test/dstencode_tests.cpp +++ b/src/test/dstencode_tests.cpp @@ -37,9 +37,9 @@ const CTxDestination dstScript = ScriptHash(uint160(hash)); std::string cashaddr_pubkey = - "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a"; + "ecash:qpm2qsznhks23z7629mms6s4cwef74vcwva87rkuu2"; std::string cashaddr_script = - "bitcoincash:ppm2qsznhks23z7629mms6s4cwef74vcwvn0h829pq"; + "ecash:ppm2qsznhks23z7629mms6s4cwef74vcwv2zrv3l8h"; std::string base58_pubkey = "1BpEi6DfDAUFd7GtittLSdBeYJvcoaVggu"; std::string base58_script = "3CWFddi6m4ndiGyKqzYvsFYagqDLPVMTzC"; diff --git a/test/functional/abc_feature_minerfund.py b/test/functional/abc_feature_minerfund.py --- a/test/functional/abc_feature_minerfund.py +++ b/test/functional/abc_feature_minerfund.py @@ -20,7 +20,7 @@ MINER_FUND_RATIO = 8 -MINER_FUND_ADDR = 'bchreg:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdgd35g0pkl' +MINER_FUND_ADDR = 'ecregtest:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdgz0wv9ltl' class MinerFundTest(BitcoinTestFramework): diff --git a/test/functional/abc_mining_basic.py b/test/functional/abc_mining_basic.py --- a/test/functional/abc_mining_basic.py +++ b/test/functional/abc_mining_basic.py @@ -23,7 +23,7 @@ from decimal import Decimal AXION_ACTIVATION_TIME = 2000000600 -MINER_FUND_ADDR = 'bchreg:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdgd35g0pkl' +MINER_FUND_ADDR = 'ecregtest:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdgz0wv9ltl' MINER_FUND_LEGACY_ADDR = '2MviGxxFciGeWTgkUgYgjqehWt18c4ZsShd' diff --git a/test/functional/abc_p2p_avalanche.py b/test/functional/abc_p2p_avalanche.py --- a/test/functional/abc_p2p_avalanche.py +++ b/test/functional/abc_p2p_avalanche.py @@ -199,7 +199,7 @@ # We need to send the coin to a new address in order to make sure we do # not regenerate the same block. node.generatetoaddress( - 26, 'bchreg:pqv2r67sgz3qumufap3h2uuj0zfmnzuv8v7ej0fffv') + 26, 'ecregtest:pqv2r67sgz3qumufap3h2uuj0zfmnzuv8v38gtrh5v') node.reconsiderblock(invalidated_block) poll_node.send_poll(various_block_hashes) diff --git a/test/functional/data/rpc_bip67.json b/test/functional/data/rpc_bip67.json --- a/test/functional/data/rpc_bip67.json +++ b/test/functional/data/rpc_bip67.json @@ -9,7 +9,7 @@ "02ff12471208c14bd580709cb2358d98975247d8765f92bc25eab3b2763ed605f8" ], "script": "522102fe6f0a5a297eb38c391581c4413e084773ea23954d93f7753db7dc0adc188b2f2102ff12471208c14bd580709cb2358d98975247d8765f92bc25eab3b2763ed605f852ae", - "address": "bchreg:ppttar4f8yf0xa592s4z4pj22cq03zn82s794w79cp" + "address": "ecregtest:ppttar4f8yf0xa592s4z4pj22cq03zn82s3m025m9p" }, { "keys": [ @@ -23,7 +23,7 @@ "02e2cc6bd5f45edd43bebe7cb9b675f0ce9ed3efe613b177588290ad188d11b404" ], "script": "522102632b12f4ac5b1d1b72b2a3b508c19172de44f6f46bcee50ba33f3f9291e47ed021027735a29bae7780a9755fae7a1c4374c656ac6a69ea9f3697fda61bb99a4f3e772102e2cc6bd5f45edd43bebe7cb9b675f0ce9ed3efe613b177588290ad188d11b40453ae", - "address": "bchreg:pp6g6vlqksp4s4lwgl6pwnsdlrt090dacg9uza2swt" + "address": "ecregtest:pp6g6vlqksp4s4lwgl6pwnsdlrt090dacg2zceqwnt" }, { "keys": [ @@ -39,7 +39,7 @@ "030000000000000000000000000000000000004141414141414141414141414141" ], "script": "522102000000000000000000000000000000000000414141414141414141414141414021020000000000000000000000000000000000004141414141414141414141414141210300000000000000000000000000000000000041414141414141414141414141402103000000000000000000000000000000000000414141414141414141414141414154ae", - "address": "bchreg:pqyts3ju07qzsd38xlyjcj9g4gs87prdqqkfwmt89s" + "address": "ecregtest:pqyts3ju07qzsd38xlyjcj9g4gs87prdqqeh5lpecs" }, { "keys": [ @@ -53,6 +53,6 @@ "03e3818b65bcc73a7d64064106a859cc1a5a728c4345ff0b641209fba0d90de6e9" ], "script": "5221021f2f6e1e50cb6a953935c3601284925decd3fd21bc445712576873fb8c6ebc1821022df8750480ad5b26950b25c7ba79d3e37d75f640f8e5d9bcd5b150a0f85014da2103e3818b65bcc73a7d64064106a859cc1a5a728c4345ff0b641209fba0d90de6e953ae", - "address": "bchreg:pr6hftp4zpwlct6z9rtv8u8vpaaee5zwlvpw5j3n9e" + "address": "ecregtest:pr6hftp4zpwlct6z9rtv8u8vpaaee5zwlvwswkmdce" } ] diff --git a/test/functional/data/rpc_psbt.json b/test/functional/data/rpc_psbt.json --- a/test/functional/data/rpc_psbt.json +++ b/test/functional/data/rpc_psbt.json @@ -46,10 +46,10 @@ ], "outputs" : [ { - "bchreg:qrv9c2m36qrqkzwf3p4whq272zv3mksjf5ln6v9le5": 1.49990000 + "ecregtest:qrv9c2m36qrqkzwf3p4whq272zv3mksjf5sdqg0py5": 1.49990000 }, { - "bchreg:qqq2a2dzuhc0sa493r0423hgwsk3mpcq3upac4z3wr": 1 + "ecregtest:qqq2a2dzuhc0sa493r0423hgwsk3mpcq3uwrz3g0nr": 1 } ], "result" : "cHNidP8BAKACAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAZdqkU2FwrcdAGCwnJiGrrgV5QmR3aEk2IrADh9QUAAAAAGXapFACuqaLl8Ph2pYjfVUbodC0dhwCPiKwAAAAAAAAAAAA=" diff --git a/test/functional/rpc_deriveaddresses.py b/test/functional/rpc_deriveaddresses.py --- a/test/functional/rpc_deriveaddresses.py +++ b/test/functional/rpc_deriveaddresses.py @@ -17,7 +17,7 @@ self.nodes[0].deriveaddresses, "a") descriptor = "pkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/0)#rdfjd0a9" - address = "bchreg:qzgrvmwc8vevauc25j86hgfpduz8j98yvvyr0qx0ew" + address = "ecregtest:qzgrvmwc8vevauc25j86hgfpduz8j98yvvta4yv3yw" assert_equal(self.nodes[0].deriveaddresses(descriptor), [address]) descriptor = descriptor[:-9] @@ -27,17 +27,17 @@ descriptor) descriptor_pubkey = "pkh(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/1/0)#7st8eans" - address = "bchreg:qzgrvmwc8vevauc25j86hgfpduz8j98yvvyr0qx0ew" + address = "ecregtest:qzgrvmwc8vevauc25j86hgfpduz8j98yvvta4yv3yw" assert_equal(self.nodes[0].deriveaddresses( descriptor_pubkey), [address]) ranged_descriptor = "pkh(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*)#77vpsvm5" assert_equal( self.nodes[0].deriveaddresses(ranged_descriptor, [1, 2]), - ["bchreg:qz7mjsvr6gglnl389gnfxmqx0asxp0hcvqjx829c6k", "bchreg:qq9q9wefpjzuna7qhuzz7rvck9tuhrzp3gvrzd8kx2"]) + ["ecregtest:qz7mjsvr6gglnl389gnfxmqx0asxp0hcvqacaw0x8k", "ecregtest:qq9q9wefpjzuna7qhuzz7rvck9tuhrzp3gracfdgm2"]) assert_equal( self.nodes[0].deriveaddresses(ranged_descriptor, 2), - [address, "bchreg:qz7mjsvr6gglnl389gnfxmqx0asxp0hcvqjx829c6k", "bchreg:qq9q9wefpjzuna7qhuzz7rvck9tuhrzp3gvrzd8kx2"]) + [address, "ecregtest:qz7mjsvr6gglnl389gnfxmqx0asxp0hcvqacaw0x8k", "ecregtest:qq9q9wefpjzuna7qhuzz7rvck9tuhrzp3gracfdgm2"]) assert_raises_rpc_error( -8, diff --git a/test/functional/rpc_generateblock.py b/test/functional/rpc_generateblock.py --- a/test/functional/rpc_generateblock.py +++ b/test/functional/rpc_generateblock.py @@ -40,7 +40,7 @@ self.log.info( 'Generate an empty block to a combo descriptor with compressed pubkey') combo_key = '0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798' - combo_address = 'bchreg:qp63uahgrxged4z5jswyt5dn5v3lzsem6c6mz8vuwd' + combo_address = 'ecregtest:qp63uahgrxged4z5jswyt5dn5v3lzsem6c49crxznd' hash = node.generateblock('combo(' + combo_key + ')', [])['hash'] block = node.getblock(hash, 2) assert_equal(len(block['tx']), 1) @@ -50,7 +50,7 @@ self.log.info( 'Generate an empty block to a combo descriptor with uncompressed pubkey') combo_key = '0408ef68c46d20596cc3f6ddf7c8794f71913add807f1dc55949fa805d764d191c0b7ce6894c126fce0babc6663042f3dde9b0cf76467ea315514e5a6731149c67' - combo_address = 'bchreg:qqmagqc48ln8p7zk6ez2h64amcamr86qwqezwt52uy' + combo_address = 'ecregtest:qqmagqc48ln8p7zk6ez2h64amcamr86qwqku5075py' hash = node.generateblock('combo(' + combo_key + ')', [])['hash'] block = node.getblock(hash, 2) assert_equal(len(block['tx']), 1) diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py --- a/test/functional/test_framework/address.py +++ b/test/functional/test_framework/address.py @@ -9,8 +9,8 @@ from .script import CScript, hash160, hash256 from .util import hex_str_to_bytes, assert_equal -ADDRESS_BCHREG_UNSPENDABLE = 'bchreg:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqha9s37tt' -ADDRESS_BCHREG_UNSPENDABLE_DESCRIPTOR = 'addr(bchreg:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqha9s37tt)#l2wkrsqu' +ADDRESS_BCHREG_UNSPENDABLE = 'ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt' +ADDRESS_BCHREG_UNSPENDABLE_DESCRIPTOR = 'addr(ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt)#u6xx93xc' chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -572,7 +572,7 @@ address_info = self.nodes[0].getaddressinfo( "mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ") assert_equal(address_info['address'], - "bchreg:qp8rs4qyd3aazk22eyzwg7fmdfzmxm02pywavdajx4") + "ecregtest:qp8rs4qyd3aazk22eyzwg7fmdfzmxm02pyprkfhvm4") assert_equal(address_info["scriptPubKey"], "76a9144e3854046c7bd1594ac904e4793b6a45b36dea0988ac") assert not address_info["ismine"] diff --git a/test/functional/wallet_importdescriptors.py b/test/functional/wallet_importdescriptors.py --- a/test/functional/wallet_importdescriptors.py +++ b/test/functional/wallet_importdescriptors.py @@ -145,8 +145,8 @@ "2N7yv4p8G8yEaPddJxY41kPihnWvs39qCMf", "2MsHxyb2JS3pAySeNUsJ7mNnurtpeenDzLA"] # hdkeypath=m/0'/0'/0' and 1' # wpkh subscripts corresponding to the above addresses - addresses += ["bchreg:prvn9ycvgr5atuyh49sua3mapskh2mnnzg34lqtyst", - "bchreg:pp3n087yx0njv2e5wcvltahfxqst7l66ruyuaun8qt"] + addresses += ["ecregtest:prvn9ycvgr5atuyh49sua3mapskh2mnnzg7t9yp6dt", + "ecregtest:pp3n087yx0njv2e5wcvltahfxqst7l66rutz8ceeat"] desc = "sh(pkh(" + xpub + "/0/0/*" + "))" self.log.info("Ranged descriptors cannot have labels") @@ -212,11 +212,11 @@ self.log.info('Key ranges should be imported in order') xpub = "tpubDAXcJ7s7ZwicqjprRaEWdPoHKrCS215qxGYxpusRLLmJuT69ZSicuGdSfyvyKpvUNYBW1s2U3NSrT6vrCYB9e6nZUEvrqnwXPF8ArTCRXMY" addresses = [ - 'bchreg:qp0v86h53rc92hjrlpwzpjtdlgzsxu25svryj39hul', # m/0'/0'/0 - 'bchreg:qqasy0zlkdleqt4pkn8fs4ehm5gnnz6qpgzxm0035q', # m/0'/0'/1 - 'bchreg:qp0sp4wlhctvprqvdt2dgvqcfdjssu04xgk64mmwew', # m/0'/0'/2 - 'bchreg:qrhn24tegn04cptfv4ldhtkduxq55zcwryhvnfcm3r', # m/0'/0'/3 - 'bchreg:qzpqhett2uwltq803vrxv7zkqhft5vsnmca8ds9jjp', # m/0'/0'/4 + 'ecregtest:qp0v86h53rc92hjrlpwzpjtdlgzsxu25svv6g40fpl', # m/0'/0'/0 + 'ecregtest:qqasy0zlkdleqt4pkn8fs4ehm5gnnz6qpgdcpt90fq', # m/0'/0'/1 + 'ecregtest:qp0sp4wlhctvprqvdt2dgvqcfdjssu04xgey0l3syw', # m/0'/0'/2 + 'ecregtest:qrhn24tegn04cptfv4ldhtkduxq55zcwrycjfdj9vr', # m/0'/0'/3 + 'ecregtest:qzpqhett2uwltq803vrxv7zkqhft5vsnmcjeh50v0p', # m/0'/0'/4 ] self.test_importdesc({'desc': descsum_create('sh(pkh([abcdef12/0h/0h]' + xpub + '/*))'), @@ -264,7 +264,7 @@ # # Test importing a descriptor containing a WIF private key wif_priv = "cTe1f5rdT8A8DFgVWTjyPwACsDPJM9ff4QngFxUixCSvvbg1x6sh" - address = "bchreg:ppn85zpvym8cdccmgw8km6e48jfhnpa435c0djwhs6" + address = "ecregtest:ppn85zpvym8cdccmgw8km6e48jfhnpa435h3hkyfd6" desc = "sh(pkh(" + wif_priv + "))" self.log.info( "Should import a descriptor with a WIF private key as spendable") @@ -317,11 +317,11 @@ # Derived at m/84'/0'/0'/0 assert_equal( addr, - 'bchreg:pzkcf26dw7np58jcspnpxaupgz9csnc3wsx25fa5q3') + 'ecregtest:pzkcf26dw7np58jcspnpxaupgz9csnc3wsf5wdh2a3') change_addr = wmulti_priv.getrawchangeaddress() assert_equal( change_addr, - 'bchreg:prnkfg7pxe3kpyv3l4v00ft6q3sfseag7vuj8tutcn') + 'ecregtest:prnkfg7pxe3kpyv3l4v00ft6q3sfseag7vnva0k49n') assert_equal(wmulti_priv.getwalletinfo()['keypoolsize'], 1000) txid = w0.sendtoaddress(addr, 10) @@ -359,11 +359,11 @@ # Derived at m/84'/0'/0'/1 assert_equal( addr, - 'bchreg:pr5xql8r03jp5dvrep22dns59vf7hhykr5u98cj6hh') + 'ecregtest:pr5xql8r03jp5dvrep22dns59vf7hhykr5nmaucy2h') change_addr = wmulti_pub.getrawchangeaddress() assert_equal( change_addr, - 'bchreg:prnkfg7pxe3kpyv3l4v00ft6q3sfseag7vuj8tutcn') + 'ecregtest:prnkfg7pxe3kpyv3l4v00ft6q3sfseag7vnva0k49n') assert_equal(wmulti_pub.getwalletinfo()['keypoolsize'], 999) txid = w0.sendtoaddress(addr, 10) diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py --- a/test/functional/wallet_importmulti.py +++ b/test/functional/wallet_importmulti.py @@ -490,12 +490,12 @@ xpriv = "tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg" # hdkeypath=m/0'/0'/0' and 1' addresses = [ - "bchreg:prvn9ycvgr5atuyh49sua3mapskh2mnnzg34lqtyst", - "bchreg:pp3n087yx0njv2e5wcvltahfxqst7l66ruyuaun8qt"] + "ecregtest:prvn9ycvgr5atuyh49sua3mapskh2mnnzg7t9yp6dt", + "ecregtest:pp3n087yx0njv2e5wcvltahfxqst7l66rutz8ceeat"] # pkh subscripts corresponding to the above addresses addresses += [ - "bchreg:qqdkxd2xnzftq2p8wr3sqqyw8lntap7tncl2076yur", - "bchreg:qpyryy83jfaec5u0gpzldk6teadsuq8zly0fwmm3pq", + "ecregtest:qqdkxd2xnzftq2p8wr3sqqyw8lntap7tncs546s6pr", + "ecregtest:qpyryy83jfaec5u0gpzldk6teadsuq8zlyqh5l30uq", ] desc = "sh(pkh(" + xpriv + "/0'/0'/*'" + "))" self.log.info( @@ -536,7 +536,7 @@ # Note: in Core's test, this address refers to the sh(wpkh()) address. # For a sh(pkh()) this does not refer to a key, so we use the subscript # address instead, which returns the same privkey. - address = "bchreg:qzh6rch6st3wjvp0h2ud87gn7xnxvf6h8yvgavjk6t" + address = "ecregtest:qzh6rch6st3wjvp0h2ud87gn7xnxvf6h8yrk8gcg8t" desc = "sh(pkh(" + wif_priv + "))" self.log.info( "Should import a descriptor with a WIF private key as spendable") @@ -770,11 +770,11 @@ assert_equal(wrpc.getwalletinfo()["private_keys_enabled"], False) xpub = "tpubDAXcJ7s7ZwicqjprRaEWdPoHKrCS215qxGYxpusRLLmJuT69ZSicuGdSfyvyKpvUNYBW1s2U3NSrT6vrCYB9e6nZUEvrqnwXPF8ArTCRXMY" addresses = [ - 'bchreg:qp0v86h53rc92hjrlpwzpjtdlgzsxu25svryj39hul', # m/0'/0'/0 - 'bchreg:qqasy0zlkdleqt4pkn8fs4ehm5gnnz6qpgzxm0035q', # m/0'/0'/1 - 'bchreg:qp0sp4wlhctvprqvdt2dgvqcfdjssu04xgk64mmwew', # m/0'/0'/2 - 'bchreg:qrhn24tegn04cptfv4ldhtkduxq55zcwryhvnfcm3r', # m/0'/0'/3 - 'bchreg:qzpqhett2uwltq803vrxv7zkqhft5vsnmca8ds9jjp', # m/0'/0'/4 + 'ecregtest:qp0v86h53rc92hjrlpwzpjtdlgzsxu25svv6g40fpl', # m/0'/0'/0 + 'ecregtest:qqasy0zlkdleqt4pkn8fs4ehm5gnnz6qpgdcpt90fq', # m/0'/0'/1 + 'ecregtest:qp0sp4wlhctvprqvdt2dgvqcfdjssu04xgey0l3syw', # m/0'/0'/2 + 'ecregtest:qrhn24tegn04cptfv4ldhtkduxq55zcwrycjfdj9vr', # m/0'/0'/3 + 'ecregtest:qzpqhett2uwltq803vrxv7zkqhft5vsnmcjeh50v0p', # m/0'/0'/4 ] result = wrpc.importmulti( [{