diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-12-06 19:25:22 +0100 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-12-06 19:26:04 +0100 |
| commit | 695ba2fe5446c633c33959786145b6f2efcaa1f1 (patch) | |
| tree | a4c8c7072720f62b07d1454e7d428769255cb046 /test | |
| parent | dca9ab48b80ff3a7dbe0ae26964a58e70d570618 (diff) | |
| parent | 99993425afc2c352b26e678b7ffbc74362ac3527 (diff) | |
Merge bitcoin/bitcoin#23486: rpc: Only allow specific types to be P2(W)SH wrapped in decodescript
99993425afc2c352b26e678b7ffbc74362ac3527 rpc: Only allow specific types to be P2(W)SH wrapped in decodescript (MarcoFalke)
Pull request description:
It seems confusing to return a P2SH wrapping address that is eventually either policy- or consensus-unspendable.
ACKs for top commit:
laanwj:
Code review re-ACK 99993425afc2c352b26e678b7ffbc74362ac3527
Tree-SHA512: 3cd530442acee7c295d244995f0f17b2cae7212f1e0970bb5807621f8ff8e4308a3236b385d77087cd493d32ee524813d8edd15e91d937ef9a800094b7bc4946
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/data/rpc_decodescript.json | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/test/functional/data/rpc_decodescript.json b/test/functional/data/rpc_decodescript.json index 12f3c92230..d1aa9ab00d 100644 --- a/test/functional/data/rpc_decodescript.json +++ b/test/functional/data/rpc_decodescript.json @@ -4,8 +4,7 @@ { "asm": "1 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", "address": "bcrt1pamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhqz6nvlh", - "type": "witness_v1_taproot", - "p2sh": "2Mt5gBng2UVL3xX4FUQinSBthq8gWQqs37g" + "type": "witness_v1_taproot" } ], [ @@ -13,8 +12,7 @@ { "asm": "1 -28398", "address": "bcrt1pamhqk96edn", - "type": "witness_unknown", - "p2sh": "2ND89Zqxi19tq7AjL5Y3un8fDWRwpwrk4tf" + "type": "witness_unknown" } ], [ @@ -38,38 +36,21 @@ "6a00", { "asm": "OP_RETURN 0", - "type": "nulldata", - "p2sh": "2NG8CqGyR16jkZU5H7J9WM5xpCT6Fpw6bww" + "type": "nulldata" } ], [ "6aee", { "asm": "OP_RETURN OP_UNKNOWN", - "type": "nonstandard", - "p2sh": "2NGU1bmCBhSooc3vkPYdea2ngDcwhNx8CeF", - "segwit": { - "asm": "0 44358a3abb4cc9f635f459edffb2a1210f849857aaf12106a1af645e034faa95", - "hex": "002044358a3abb4cc9f635f459edffb2a1210f849857aaf12106a1af645e034faa95", - "address": "bcrt1qgs6c5w4mfnylvd05t8kllv4pyy8cfxzh4tcjzp4p4aj9uq60422sw9mgmf", - "type": "witness_v0_scripthash", - "p2sh-segwit": "2N9xFeGJC4Z2BQcVEq7vyeNUZiVoANFbrX1" - } + "type": "nonstandard" } ], [ "6a02ee", { "asm": "OP_RETURN [error]", - "type": "nonstandard", - "p2sh": "2N9JFV56rrkTYVnrJTMFSpKNsq6j5NbAdQr", - "segwit": { - "asm": "0 6f3d493995bda1f72a8f4de96663be22b583623a05f5ae98f38c45b8e03ca5da", - "hex": "00206f3d493995bda1f72a8f4de96663be22b583623a05f5ae98f38c45b8e03ca5da", - "address": "bcrt1qdu75jwv4hkslw250fh5kvca7y26cxc36qh66ax8n33zm3cpu5hdqdtm4gp", - "type": "witness_v0_scripthash", - "p2sh-segwit": "2N3TqW8vuVr987Z695CmLNmLLXobBRMmqho" - } + "type": "nonstandard" } ], [ @@ -91,30 +72,14 @@ "ba", { "asm": "OP_CHECKSIGADD", - "type": "nonstandard", - "p2sh": "2MyX11u6v747zcKHTJMjXFgkj1vYZgHr4i1", - "segwit": { - "asm": "0 281c93990bac2c69cf372c9a3b66c406c86cca826d6407b68e644da22eef8186", - "hex": "0020281c93990bac2c69cf372c9a3b66c406c86cca826d6407b68e644da22eef8186", - "address": "bcrt1q9qwf8xgt4skxnneh9jdrkekyqmyxej5zd4jq0d5wv3x6yth0sxrqe2wl7r", - "type": "witness_v0_scripthash", - "p2sh-segwit": "2NBoeWVFMmZdEhLzP5kpvjnJ8c1GucsCbFK" - } + "type": "nonstandard" } ], [ "50", { "asm": "OP_RESERVED", - "type": "nonstandard", - "p2sh": "2NEqnmDnSWcfTRBG2t6M53ey6mjc8ncHesN", - "segwit": { - "asm": "0 5c62e091b8c0565f1bafad0dad5934276143ae2ccef7a5381e8ada5b1a8d26d2", - "hex": "00205c62e091b8c0565f1bafad0dad5934276143ae2ccef7a5381e8ada5b1a8d26d2", - "address": "bcrt1qt33wpydccpt97xa045x66kf5yas58t3vemm62wq73td9kx5dymfqknplwh", - "type": "witness_v0_scripthash", - "p2sh-segwit": "2NEtjT3ku2KjZo53bnwKX2v928Mzx5sjdUh" - } + "type": "nonstandard" } ] -]
\ No newline at end of file +] |