diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp --- a/src/bench/wallet_balance.cpp +++ b/src/bench/wallet_balance.cpp @@ -26,7 +26,7 @@ }, }; - const auto &ADDRESS_WATCHONLY = ADDRESS_BCHREG_UNSPENDABLE; + const auto &ADDRESS_WATCHONLY = ADDRESS_ECREG_UNSPENDABLE; const Config &config = GetConfig(); diff --git a/src/test/util/wallet.h b/src/test/util/wallet.h --- a/src/test/util/wallet.h +++ b/src/test/util/wallet.h @@ -12,7 +12,7 @@ // Constants // -extern const std::string ADDRESS_BCHREG_UNSPENDABLE; +extern const std::string ADDRESS_ECREG_UNSPENDABLE; // RPC-like // diff --git a/src/test/util/wallet.cpp b/src/test/util/wallet.cpp --- a/src/test/util/wallet.cpp +++ b/src/test/util/wallet.cpp @@ -11,7 +11,7 @@ #include #endif // ENABLE_WALLET -const std::string ADDRESS_BCHREG_UNSPENDABLE = +const std::string ADDRESS_ECREG_UNSPENDABLE = "ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt"; #ifdef ENABLE_WALLET diff --git a/test/functional/abc_p2p_avalanche_peer_discovery.py b/test/functional/abc_p2p_avalanche_peer_discovery.py --- a/test/functional/abc_p2p_avalanche_peer_discovery.py +++ b/test/functional/abc_p2p_avalanche_peer_discovery.py @@ -10,7 +10,7 @@ import time -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE from test_framework.avatools import ( get_ava_p2p_interface, create_coinbase_stakes, @@ -251,7 +251,7 @@ # Change the address to make sure we don't generate a block identical # to the one we just invalidated. Can be generate(1) after D9694 or # D9697 is landed. - forked_tip = node.generatetoaddress(1, ADDRESS_BCHREG_UNSPENDABLE)[0] + forked_tip = node.generatetoaddress(1, ADDRESS_ECREG_UNSPENDABLE)[0] wait_until(lambda: node.getbestblockhash() == forked_tip) wait_until(lambda: len(node.getavalanchepeerinfo()) == 1) diff --git a/test/functional/abc_p2p_proof_inventory.py b/test/functional/abc_p2p_proof_inventory.py --- a/test/functional/abc_p2p_proof_inventory.py +++ b/test/functional/abc_p2p_proof_inventory.py @@ -11,7 +11,7 @@ get_proof_ids, wait_for_proof, ) -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE from test_framework.key import ECKey, bytes_to_wif from test_framework.messages import ( AvalancheProof, @@ -266,7 +266,7 @@ "txid": "{:064x}".format(utxo.hash), "vout": utxo.n }], - outputs={ADDRESS_BCHREG_UNSPENDABLE: 25_000_000 - 250.00}, + outputs={ADDRESS_ECREG_UNSPENDABLE: 25_000_000 - 250.00}, ) signed_tx = node.signrawtransactionwithkey( hexstring=raw_tx, diff --git a/test/functional/abc_rpc_avalancheproof.py b/test/functional/abc_rpc_avalancheproof.py --- a/test/functional/abc_rpc_avalancheproof.py +++ b/test/functional/abc_rpc_avalancheproof.py @@ -6,7 +6,7 @@ import base64 from decimal import Decimal -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE from test_framework.avatools import ( create_coinbase_stakes, create_stakes, @@ -329,7 +329,7 @@ # Orphan the proof by sending the stake raw_tx = node.createrawtransaction( [{"txid": stakes[-1]["txid"], "vout": 0}], - {ADDRESS_BCHREG_UNSPENDABLE: stakes[-1] + {ADDRESS_ECREG_UNSPENDABLE: stakes[-1] ["amount"] - Decimal('10000')} ) signed_tx = node.signrawtransactionwithkey(raw_tx, [addrkey0.key]) diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -6,7 +6,7 @@ """Test the -alertnotify, -blocknotify and -walletnotify options.""" import os -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, @@ -61,7 +61,7 @@ blocks = self.nodes[1].generatetoaddress( block_count, self.nodes[1].getnewaddress() if self.is_wallet_compiled() - else ADDRESS_BCHREG_UNSPENDABLE + else ADDRESS_ECREG_UNSPENDABLE ) # wait at most 10 seconds for expected number of files before reading @@ -118,9 +118,9 @@ # Create an invalid chain and ensure the node warns. self.log.info("test -alertnotify for forked chain") fork_block = self.nodes[0].getbestblockhash() - self.nodes[0].generatetoaddress(1, ADDRESS_BCHREG_UNSPENDABLE) + self.nodes[0].generatetoaddress(1, ADDRESS_ECREG_UNSPENDABLE) invalid_block = self.nodes[0].getbestblockhash() - self.nodes[0].generatetoaddress(7, ADDRESS_BCHREG_UNSPENDABLE) + self.nodes[0].generatetoaddress(7, ADDRESS_ECREG_UNSPENDABLE) # Invalidate a large branch, which should trigger an alert. self.nodes[0].invalidateblock(invalid_block) diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -6,7 +6,7 @@ import struct from io import BytesIO -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE from test_framework.test_framework import BitcoinTestFramework from test_framework.messages import CTransaction, hash256 from test_framework.util import ( @@ -91,7 +91,7 @@ self.log.info( "Generate {0} blocks (and {0} coinbase txes)".format(num_blocks)) genhashes = self.nodes[0].generatetoaddress( - num_blocks, ADDRESS_BCHREG_UNSPENDABLE) + num_blocks, ADDRESS_ECREG_UNSPENDABLE) self.sync_all() @@ -132,7 +132,7 @@ # Mining the block with this tx should result in second notification # after coinbase tx notification - self.nodes[0].generatetoaddress(1, ADDRESS_BCHREG_UNSPENDABLE) + self.nodes[0].generatetoaddress(1, ADDRESS_ECREG_UNSPENDABLE) hashtx.receive() txid = hashtx.receive() assert_equal(payment_txid, txid.hex()) @@ -181,7 +181,7 @@ payment_txid = self.nodes[0].sendtoaddress( self.nodes[0].getnewaddress(), 1000000) disconnect_block = self.nodes[0].generatetoaddress( - 1, ADDRESS_BCHREG_UNSPENDABLE)[0] + 1, ADDRESS_ECREG_UNSPENDABLE)[0] disconnect_cb = self.nodes[0].getblock(disconnect_block)["tx"][0] assert_equal( self.nodes[0].getbestblockhash(), @@ -191,7 +191,7 @@ # Generate 2 blocks in nodes[1] connect_blocks = self.nodes[1].generatetoaddress( - 2, ADDRESS_BCHREG_UNSPENDABLE) + 2, ADDRESS_ECREG_UNSPENDABLE) # nodes[0] will reorg chain after connecting back nodes[1] connect_nodes(self.nodes[0], self.nodes[1]) diff --git a/test/functional/p2p_inv_download.py b/test/functional/p2p_inv_download.py --- a/test/functional/p2p_inv_download.py +++ b/test/functional/p2p_inv_download.py @@ -6,7 +6,7 @@ Test inventory download behavior """ -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE from test_framework.avatools import wait_for_proof from test_framework.key import ECKey, bytes_to_wif from test_framework.messages import ( @@ -170,7 +170,7 @@ "txid": self.nodes[0].getblock(self.nodes[0].getblockhash(1))['tx'][0], "vout": 0 }], - outputs={ADDRESS_BCHREG_UNSPENDABLE: 50000000 - 250.00}, + outputs={ADDRESS_ECREG_UNSPENDABLE: 50000000 - 250.00}, ) tx = self.nodes[0].signrawtransactionwithkey( hexstring=tx, diff --git a/test/functional/rpc_invalidateblock.py b/test/functional/rpc_invalidateblock.py --- a/test/functional/rpc_invalidateblock.py +++ b/test/functional/rpc_invalidateblock.py @@ -4,7 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the invalidateblock RPC.""" -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE_DESCRIPTOR +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE_DESCRIPTOR from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, @@ -69,7 +69,7 @@ self.log.info("Verify that we reconsider all ancestors as well") blocks = self.nodes[1].generatetodescriptor( - 10, ADDRESS_BCHREG_UNSPENDABLE_DESCRIPTOR) + 10, ADDRESS_ECREG_UNSPENDABLE_DESCRIPTOR) assert_equal(self.nodes[1].getbestblockhash(), blocks[-1]) # Invalidate the two blocks at the tip self.nodes[1].invalidateblock(blocks[-1]) @@ -82,7 +82,7 @@ self.log.info("Verify that we reconsider all descendants") blocks = self.nodes[1].generatetodescriptor( - 10, ADDRESS_BCHREG_UNSPENDABLE_DESCRIPTOR) + 10, ADDRESS_ECREG_UNSPENDABLE_DESCRIPTOR) assert_equal(self.nodes[1].getbestblockhash(), blocks[-1]) # Invalidate the two blocks at the tip self.nodes[1].invalidateblock(blocks[-2]) 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 = 'ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt' -ADDRESS_BCHREG_UNSPENDABLE_DESCRIPTOR = 'addr(ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt)#u6xx93xc' +ADDRESS_ECREG_UNSPENDABLE = 'ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt' +ADDRESS_ECREG_UNSPENDABLE_DESCRIPTOR = 'addr(ecregtest:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqcrl5mqkt)#u6xx93xc' chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' diff --git a/test/functional/wallet_balance.py b/test/functional/wallet_balance.py --- a/test/functional/wallet_balance.py +++ b/test/functional/wallet_balance.py @@ -6,7 +6,7 @@ from decimal import Decimal import struct -from test_framework.address import ADDRESS_BCHREG_UNSPENDABLE as ADDRESS_WATCHONLY +from test_framework.address import ADDRESS_ECREG_UNSPENDABLE as ADDRESS_WATCHONLY from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal,