diff options
| author | Ross Nicoll <[email protected]> | 2021-03-04 10:25:29 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-04 11:25:29 +0100 |
| commit | 8b0dcb523dcda768988f0ed661a70611c3d727b3 (patch) | |
| tree | 92310d01b30ad232f41801c529ab865fcccd07d7 /test/functional/test_framework | |
| parent | Disable compatibility tests (#1754) (diff) | |
| download | discoin-8b0dcb523dcda768988f0ed661a70611c3d727b3.tar.xz discoin-8b0dcb523dcda768988f0ed661a70611c3d727b3.zip | |
1.21 key prefix (#1710)
Squash-merged on request.
* Dogecoin address prefixes
* Use "doge" for BECH32 addresses
* Switch Bitcoin references to Dogecoin in Travis
* Update addresses in dogecoin-tx tests
* Use "doge" for BECH32 addresses
* Remove functional tests which do not apply to Dogecoin (backwards compatibility tests do not have suitable clients to test against)
Diffstat (limited to 'test/functional/test_framework')
| -rw-r--r-- | test/functional/test_framework/address.py | 12 | ||||
| -rw-r--r-- | test/functional/test_framework/segwit_addr.py | 8 | ||||
| -rwxr-xr-x | test/functional/test_framework/test_node.py | 24 | ||||
| -rwxr-xr-x | test/functional/test_framework/wallet_util.py | 2 |
4 files changed, 23 insertions, 23 deletions
diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py index 360962b8d..b4c9d9a49 100644 --- a/test/functional/test_framework/address.py +++ b/test/functional/test_framework/address.py @@ -14,10 +14,10 @@ from .script import hash256, hash160, sha256, CScript, OP_0 from .segwit_addr import encode_segwit_address from .util import assert_equal, hex_str_to_bytes -ADDRESS_BCRT1_UNSPENDABLE = 'bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3xueyj' -ADDRESS_BCRT1_UNSPENDABLE_DESCRIPTOR = 'addr(bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3xueyj)#juyq9d97' +ADDRESS_BCRT1_UNSPENDABLE = 'dcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqtlqpp6' +ADDRESS_BCRT1_UNSPENDABLE_DESCRIPTOR = 'addr(dcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqtlqpp6)#rvmkcrkn' # Coins sent to this address can be spent with a witness stack of just OP_TRUE -ADDRESS_BCRT1_P2WSH_OP_TRUE = 'bcrt1qft5p2uhsdcdc3l2ua4ap5qqfg4pjaqlp250x7us7a8qqhrxrxfsqseac85' +ADDRESS_BCRT1_P2WSH_OP_TRUE = 'dcrt1qft5p2uhsdcdc3l2ua4ap5qqfg4pjaqlp250x7us7a8qqhrxrxfsq2qpqzu' class AddressType(enum.Enum): @@ -77,12 +77,12 @@ def base58_to_byte(s): def keyhash_to_p2pkh(hash, main=False): assert len(hash) == 20 - version = 0 if main else 111 + version = 30 if main else 113 return byte_to_base58(hash, version) def scripthash_to_p2sh(hash, main=False): assert len(hash) == 20 - version = 5 if main else 196 + version = 22 if main else 196 return byte_to_base58(hash, version) def key_to_p2pkh(key, main=False): @@ -104,7 +104,7 @@ def program_to_witness(version, program, main=False): assert 0 <= version <= 16 assert 2 <= len(program) <= 40 assert version > 0 or len(program) in [20, 32] - return encode_segwit_address("bc" if main else "bcrt", version, program) + return encode_segwit_address("doge" if main else "dcrt", version, program) def script_to_p2wsh(script, main=False): script = check_script(script) diff --git a/test/functional/test_framework/segwit_addr.py b/test/functional/test_framework/segwit_addr.py index 00c0d8a91..e73c24c46 100644 --- a/test/functional/test_framework/segwit_addr.py +++ b/test/functional/test_framework/segwit_addr.py @@ -110,12 +110,12 @@ class TestFrameworkScript(unittest.TestCase): def test_segwit_encode_decode(self): def test_python_bech32(addr): hrp = addr[:4] - self.assertEqual(hrp, "bcrt") + self.assertEqual(hrp, "dcrt") (witver, witprog) = decode_segwit_address(hrp, addr) self.assertEqual(encode_segwit_address(hrp, witver, witprog), addr) # P2WPKH - test_python_bech32('bcrt1qthmht0k2qnh3wy7336z05lu2km7emzfpm3wg46') + test_python_bech32('dcrt1qthmht0k2qnh3wy7336z05lu2km7emzfp7a0j9y') # P2WSH - test_python_bech32('bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3xueyj') - test_python_bech32('bcrt1qft5p2uhsdcdc3l2ua4ap5qqfg4pjaqlp250x7us7a8qqhrxrxfsqseac85') + test_python_bech32('dcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqtlqpp6') + test_python_bech32('dcrt1qft5p2uhsdcdc3l2ua4ap5qqfg4pjaqlp250x7us7a8qqhrxrxfsq2qpqzu') diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 91341ca0e..d10739e01 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -134,18 +134,18 @@ class TestNode(): AddressKeyPair = collections.namedtuple('AddressKeyPair', ['address', 'key']) PRIV_KEYS = [ # address , privkey - AddressKeyPair('mjTkW3DjgyZck4KbiRusZsqTgaYTxdSz6z', 'cVpF924EspNh8KjYsfhgY96mmxvT6DgdWiTYMtMjuM74hJaU5psW'), - AddressKeyPair('msX6jQXvxiNhx3Q62PKeLPrhrqZQdSimTg', 'cUxsWyKyZ9MAQTaAhUQWJmBbSvHMwSmuv59KgxQV7oZQU3PXN3KE'), - AddressKeyPair('mnonCMyH9TmAsSj3M59DsbH8H63U3RKoFP', 'cTrh7dkEAeJd6b3MRX9bZK8eRmNqVCMH3LSUkE3dSFDyzjU38QxK'), - AddressKeyPair('mqJupas8Dt2uestQDvV2NH3RU8uZh2dqQR', 'cVuKKa7gbehEQvVq717hYcbE9Dqmq7KEBKqWgWrYBa2CKKrhtRim'), - AddressKeyPair('msYac7Rvd5ywm6pEmkjyxhbCDKqWsVeYws', 'cQDCBuKcjanpXDpCqacNSjYfxeQj8G6CAtH1Dsk3cXyqLNC4RPuh'), - AddressKeyPair('n2rnuUnwLgXqf9kk2kjvVm8R5BZK1yxQBi', 'cQakmfPSLSqKHyMFGwAqKHgWUiofJCagVGhiB4KCainaeCSxeyYq'), - AddressKeyPair('myzuPxRwsf3vvGzEuzPfK9Nf2RfwauwYe6', 'cQMpDLJwA8DBe9NcQbdoSb1BhmFxVjWD5gRyrLZCtpuF9Zi3a9RK'), - AddressKeyPair('mumwTaMtbxEPUswmLBBN3vM9oGRtGBrys8', 'cSXmRKXVcoouhNNVpcNKFfxsTsToY5pvB9DVsFksF1ENunTzRKsy'), - AddressKeyPair('mpV7aGShMkJCZgbW7F6iZgrvuPHjZjH9qg', 'cSoXt6tm3pqy43UMabY6eUTmR3eSUYFtB2iNQDGgb3VUnRsQys2k'), - AddressKeyPair('mq4fBNdckGtvY2mijd9am7DRsbRB4KjUkf', 'cN55daf1HotwBAgAKWVgDcoppmUNDtQSfb7XLutTLeAgVc3u8hik'), - AddressKeyPair('mpFAHDjX7KregM3rVotdXzQmkbwtbQEnZ6', 'cT7qK7g1wkYEMvKowd2ZrX1E5f6JQ7TM246UfqbCiyF7kZhorpX3'), - AddressKeyPair('mzRe8QZMfGi58KyWCse2exxEFry2sfF2Y7', 'cPiRWE8KMjTRxH1MWkPerhfoHFn5iHPWVK5aPqjW8NxmdwenFinJ'), + AddressKeyPair('nY8xUFpK7LVNNvbmmGaWY8P2wb4MMphFJT', 'cnyWHLn3E8Cy5Mm5ypVU8VHkGqKkm4E5qbhoUo3vtJcVFy4PwZN7'), + AddressKeyPair('ngCJhd8WP5JTaugG5DzHJeQH7r5J16Yac3', 'cn88fJ3muTBSMVbhodCHu7NZwngfcHKNExPaos6g6m4q2hoCXmPX'), + AddressKeyPair('nbUzAaZrZpgvWK1DPuorqqphY6ZMYACsp9', 'cm1xFxU2Wx8u3d4tXfwP9fKcvdn9A2tjNDgjs8jpRCjQZPrRvhi1'), + AddressKeyPair('ndz7noTheExfHkAaGm9fLXazj9RT8cYoJV', 'co4aTtqUwxXWMxXND9uV8xnCe6F5VwrgWD5moRYjAXXcszJ9y3pu'), + AddressKeyPair('ngDnaL2W3SuhPy6QpbQcvx8mULMQLL2NPE', 'chNTLE3R5td6UFqjwjQA35jeTWp2o6deVmXGLnSEbVVFu2b1uVnT'), + AddressKeyPair('nqXzshPWm3TbJ22v5bQZU1fzLC5CVUwTZX', 'chk1uz7EgkfbF1NnP5xcudsUybCxy388p9wyHy1PZgJ1CrusvJeR'), + AddressKeyPair('nng7NB2XJ1ygZ9GQxq4JHPvEHSBpzyqb5E', 'chX5Mf2jWS3TbBQ9WkRb2wCACdfGAa3fQZgEyFFPsnQfiEBy5Nfa'), + AddressKeyPair('niT9RnxU2KA97kDwP1r12Atj4Gwmg3K9xK', 'cjh2ZeFHy7eBeQQ2vmA6r29qxjs7CvNNW2TkzAT4DxjoUSv9uRXT'), + AddressKeyPair('ndAKYV3Gn7DxCYsgA5mMXwQWAPod12EVeQ', 'cjxo2RcZQ8gF15VtgkKtEpejuv3k9NoLVuxdX7xsZzzuM6Kwmum6'), + AddressKeyPair('ndjs9bECAdpgAu3tnTpDjMm18bw4Q5jhgW', 'cfELmuNoe7jD8ChhRfHToxzoKdsftiwtzUMnTpaeKbg74GSnM8tR'), + AddressKeyPair('ncvNFSL6XgnQKDL2YeZGWExM1cTn2W1Zdr', 'ckH6TSPpJ4NWJxMM3mpMSsCCaXVc4wzoLwLjnkHPhvkYKE7F5Cjd'), + AddressKeyPair('no6r6d9w5ddpmCFgFiJfdDVoWsUvFD6EMk', 'cgsgeYr7i3HhuK2tcuBST3rmn8BPP7vxpCKqWkRh7LUCCc7y3ELb'), ] def get_deterministic_priv_key(self): diff --git a/test/functional/test_framework/wallet_util.py b/test/functional/test_framework/wallet_util.py index b9c0fb669..2d23d2f95 100755 --- a/test/functional/test_framework/wallet_util.py +++ b/test/functional/test_framework/wallet_util.py @@ -122,7 +122,7 @@ def test_address(node, address, **kwargs): def bytes_to_wif(b, compressed=True): if compressed: b += b'\x01' - return byte_to_base58(b, 239) + return byte_to_base58(b, 241) def generate_wif_key(): # Makes a WIF privkey for imports |