From b3234322f7e6c99a837b1a60158f7417ef2ea170 Mon Sep 17 00:00:00 2001 From: Jianping Wu Date: Sat, 9 Feb 2019 19:23:04 -0800 Subject: [PATCH] Fixed all util test cases. --- test/util/data/bitcoin-util-test.json | 32 +++++++++++++-------------- test/util/data/txcreate1.hex | 2 +- test/util/data/txcreate1.json | 26 +++++++++++----------- test/util/data/txcreatedata1.hex | 2 +- test/util/data/txcreatedata1.json | 18 +++++++-------- test/util/data/txcreatedata2.hex | 2 +- test/util/data/txcreatedata2.json | 18 +++++++-------- test/util/data/txcreatedata_seq0.hex | 2 +- test/util/data/txcreatedata_seq0.json | 18 +++++++-------- test/util/data/txcreatesignv1.hex | 2 +- test/util/data/txcreatesignv1.json | 18 +++++++-------- test/util/data/txcreatesignv2.hex | 2 +- 12 files changed, 71 insertions(+), 71 deletions(-) diff --git a/test/util/data/bitcoin-util-test.json b/test/util/data/bitcoin-util-test.json index 6cbb31974..88654c65a 100644 --- a/test/util/data/bitcoin-util-test.json +++ b/test/util/data/bitcoin-util-test.json @@ -114,8 +114,8 @@ "in=5ee62e3f7757f5fd995b2fa1bdb5b744298146098d5de92959ec4b52dc77191e:1", "in=3cd215c1c6b7ae33bc6266f268fd212b83860e13902b454502ce6d54448e398a:25", "in=0f941395005b80a61726baecebb11d7caa184a1a58246daff7dffca793ab07b8:12", - "outaddr=12.52000000:LT7W6xCWK9tZVyyg3iifzHp8vUgMKke4sY", - "outaddr=0.01000487:LMnn592npBwmeLtTfKc9RoZUqAe2rDgvKX"], + "outaddr=12.52000000:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63", + "outaddr=0.01000487:VLLcbhdNT2PJL9HazDA7RzeXGeVBN11NW3"], "output_cmp": "txcreate1.hex", "description": "Creates a new transaction with three inputs and two outputs" }, @@ -126,8 +126,8 @@ "in=5ee62e3f7757f5fd995b2fa1bdb5b744298146098d5de92959ec4b52dc77191e:1", "in=3cd215c1c6b7ae33bc6266f268fd212b83860e13902b454502ce6d54448e398a:25", "in=0f941395005b80a61726baecebb11d7caa184a1a58246daff7dffca793ab07b8:12", - "outaddr=12.52000000:LMgENNXzzuPxp7vfMjDrCU44bsmrEMgqvc", - "outaddr=0.01000487:LV1ByjbJNFTHyFQqwqwdJXKJznYDzXzg4B"], + "outaddr=12.52000000:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63", + "outaddr=0.01000487:VLLcbhdNT2PJL9HazDA7RzeXGeVBN11NW3"], "output_cmp": "txcreate1.json", "description": "Creates a new transaction with three inputs and two outputs (output in json)" }, @@ -195,10 +195,10 @@ "args": ["-create", "nversion=1", "in=6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7:0", - "set=privatekeys:[\"T3Eyvg7Me8fuajt2RJvQaRokRabBweiyBWVJiQG8P1bwDUEXPhqv\"]", + "set=privatekeys:[\"MdT1ZhNgpaNhvtcobunP8MHdxbBB1HLUf1FJAUkEmQqtSLtjCCo4\"]", "set=prevtxs:[{\"txid\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\",\"vout\":0,\"scriptPubKey\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\"}]", "sign=ALL", - "outaddr=0.001:LXC44cQhuRufFtaDhDYv4q8nxQJBkUAsXp"], + "outaddr=0.001:VDFah8VXKvYGv8ScKjZDgTSbWh21JhXaa7"], "output_cmp": "txcreatesignv1.hex", "description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction" }, @@ -207,10 +207,10 @@ ["-json", "-create", "nversion=1", "in=6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7:0", - "set=privatekeys:[\"T3Eyvg7Me8fuajt2RJvQaRokRabBweiyBWVJiQG8P1bwDUEXPhqv\"]", + "set=privatekeys:[\"MdT1ZhNgpaNhvtcobunP8MHdxbBB1HLUf1FJAUkEmQqtSLtjCCo4\"]", "set=prevtxs:[{\"txid\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\",\"vout\":0,\"scriptPubKey\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\"}]", "sign=ALL", - "outaddr=0.001:LXC44cQhuRufFtaDhDYv4q8nxQJBkUAsXp"], + "outaddr=0.001:VDFah8VXKvYGv8ScKjZDgTSbWh21JhXaa7"], "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)" }, @@ -218,10 +218,10 @@ "args": ["-create", "in=6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7:0", - "set=privatekeys:[\"T3Eyvg7Me8fuajt2RJvQaRokRabBweiyBWVJiQG8P1bwDUEXPhqv\"]", + "set=privatekeys:[\"MdT1ZhNgpaNhvtcobunP8MHdxbBB1HLUf1FJAUkEmQqtSLtjCCo4\"]", "set=prevtxs:[{\"txid\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\",\"vout\":0,\"scriptPubKey\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\"}]", "sign=ALL", - "outaddr=0.001:LXC44cQhuRufFtaDhDYv4q8nxQJBkUAsXp"], + "outaddr=0.001:VDFah8VXKvYGv8ScKjZDgTSbWh21JhXaa7"], "output_cmp": "txcreatesignv2.hex", "description": "Creates a new transaction with a single input and a single output, and then signs the transaction" }, @@ -290,7 +290,7 @@ "args": ["-create", "in=69e9c12d30a6cd598a31ddfcaabeb9d9f0baf8938bf0ba6610beb04f589cc5ef:0", - "outaddr=0.002:LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg", + "outaddr=0.002:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63", "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata1.hex", "description": "Creates a new transaction with one input, one address output and one data output" @@ -300,7 +300,7 @@ ["-json", "-create", "nversion=1", "in=69e9c12d30a6cd598a31ddfcaabeb9d9f0baf8938bf0ba6610beb04f589cc5ef:0", - "outaddr=0.002:LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg", + "outaddr=0.002:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63", "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)" @@ -309,7 +309,7 @@ "args": ["-create", "in=69e9c12d30a6cd598a31ddfcaabeb9d9f0baf8938bf0ba6610beb04f589cc5ef:0", - "outaddr=0.002:LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg", + "outaddr=0.002:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63", "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata2.hex", "description": "Creates a new transaction with one input, one address output and one data (zero value) output" @@ -319,7 +319,7 @@ ["-json", "-create", "in=69e9c12d30a6cd598a31ddfcaabeb9d9f0baf8938bf0ba6610beb04f589cc5ef:0", - "outaddr=0.002:LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg", + "outaddr=0.002:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63", "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)" @@ -328,7 +328,7 @@ "args": ["-create", "in=69e9c12d30a6cd598a31ddfcaabeb9d9f0baf8938bf0ba6610beb04f589cc5ef:0:4294967293", - "outaddr=0.002:LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg"], + "outaddr=0.002:VM3caubzqsnbUmGvdgF5BBEWea77zPxt63"], "output_cmp": "txcreatedata_seq0.hex", "description": "Creates a new transaction with one input with sequence number and one address output" }, @@ -337,7 +337,7 @@ ["-json", "-create", "in=69e9c12d30a6cd598a31ddfcaabeb9d9f0baf8938bf0ba6610beb04f589cc5ef:0:4294967293", - "outaddr=0.002:LhzRRruapBx5gEtAf9RuVEePrzcG1wxRYa"], + "outaddr=0.002:VDFah8VXKvYGv8ScKjZDgTSbWh21JhXaa7"], "output_cmp": "txcreatedata_seq0.json", "description": "Creates a new transaction with one input with sequence number and one address output (output in json)" }, diff --git a/test/util/data/txcreate1.hex b/test/util/data/txcreate1.hex index 5a5ba5764..a9c5cd3fb 100644 --- a/test/util/data/txcreate1.hex +++ b/test/util/data/txcreate1.hex @@ -1 +1 @@ -02000000031e1977dc524bec5929e95d8d0946812944b7b5bda12f5b99fdf557773f2ee65e0100000000ffffffff8a398e44546dce0245452b90130e86832b21fd68f26662bc33aeb7c6c115d23c1900000000ffffffffb807ab93a7fcdff7af6d24581a4a18aa7c1db1ebecba2617a6805b009513940f0c00000000ffffffff020001a04a000000001976a9145688ac6b45bcc02f738e2970d2381d068d68eea788ac27440f00000000001976a9141c2578aa5e5c10ba3b6c3b71a78bff48077d8ba188ac00000000 +02000000031e1977dc524bec5929e95d8d0946812944b7b5bda12f5b99fdf557773f2ee65e0100000000ffffffff8a398e44546dce0245452b90130e86832b21fd68f26662bc33aeb7c6c115d23c1900000000ffffffffb807ab93a7fcdff7af6d24581a4a18aa7c1db1ebecba2617a6805b009513940f0c00000000ffffffff020001a04a0000000017a91471ed53322d470bb96657deb786b94f97dd46fb158727440f000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000 diff --git a/test/util/data/txcreate1.json b/test/util/data/txcreate1.json index 542ace7e0..7b983f782 100644 --- a/test/util/data/txcreate1.json +++ b/test/util/data/txcreate1.json @@ -1,9 +1,9 @@ { - "txid": "1c50c1770374d7de2f81a87463a5225bb620d25fd467536223a5b715a47c9e32", - "hash": "1c50c1770374d7de2f81a87463a5225bb620d25fd467536223a5b715a47c9e32", + "txid": "8e9fec27161c625e021948f8126e5c2400022c59def7b61f42f9988235078410", + "hash": "8e9fec27161c625e021948f8126e5c2400022c59def7b61f42f9988235078410", "version": 2, - "size": 201, - "vsize": 201, + "size": 197, + "vsize": 197, "locktime": 0, "vin": [ { @@ -39,12 +39,12 @@ "value": 12.52000000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 1ae882e788091732da6910595314447c9e38bd8d OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9141ae882e788091732da6910595314447c9e38bd8d88ac", + "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL", + "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587", "reqSigs": 1, - "type": "pubkeyhash", + "type": "scripthash", "addresses": [ - "LMgENNXzzuPxp7vfMjDrCU44bsmrEMgqvc" + "VM3caubzqsnbUmGvdgF5BBEWea77zPxt63" ] } }, @@ -52,15 +52,15 @@ "value": 0.01000487, "n": 1, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 6b474cbf0f6004329b630bdd4798f2c23d1751b6 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9146b474cbf0f6004329b630bdd4798f2c23d1751b688ac", + "asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL", + "hex": "a9146a2c482f4985f57e702f325816c90e3723ca81ae87", "reqSigs": 1, - "type": "pubkeyhash", + "type": "scripthash", "addresses": [ - "LV1ByjbJNFTHyFQqwqwdJXKJznYDzXzg4B" + "VLLcbhdNT2PJL9HazDA7RzeXGeVBN11NW3" ] } } ], - "hex": "02000000031e1977dc524bec5929e95d8d0946812944b7b5bda12f5b99fdf557773f2ee65e0100000000ffffffff8a398e44546dce0245452b90130e86832b21fd68f26662bc33aeb7c6c115d23c1900000000ffffffffb807ab93a7fcdff7af6d24581a4a18aa7c1db1ebecba2617a6805b009513940f0c00000000ffffffff020001a04a000000001976a9141ae882e788091732da6910595314447c9e38bd8d88ac27440f00000000001976a9146b474cbf0f6004329b630bdd4798f2c23d1751b688ac00000000" + "hex": "02000000031e1977dc524bec5929e95d8d0946812944b7b5bda12f5b99fdf557773f2ee65e0100000000ffffffff8a398e44546dce0245452b90130e86832b21fd68f26662bc33aeb7c6c115d23c1900000000ffffffffb807ab93a7fcdff7af6d24581a4a18aa7c1db1ebecba2617a6805b009513940f0c00000000ffffffff020001a04a0000000017a91471ed53322d470bb96657deb786b94f97dd46fb158727440f000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000" } diff --git a/test/util/data/txcreatedata1.hex b/test/util/data/txcreatedata1.hex index 68849ffcf..d28e47d75 100644 --- a/test/util/data/txcreatedata1.hex +++ b/test/util/data/txcreatedata1.hex @@ -1 +1 @@ -0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d0300000000001976a914feda50542e61108cf53b93dbffa0959f91ccb32588ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 +0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d03000000000017a91471ed53322d470bb96657deb786b94f97dd46fb15870084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 diff --git a/test/util/data/txcreatedata1.json b/test/util/data/txcreatedata1.json index 58c2d8709..06c42d870 100644 --- a/test/util/data/txcreatedata1.json +++ b/test/util/data/txcreatedata1.json @@ -1,9 +1,9 @@ { - "txid": "111faf6fcbb3c31500966d87044cb34d47e698cae2ba85640c673fd1ad3d68b9", - "hash": "111faf6fcbb3c31500966d87044cb34d47e698cae2ba85640c673fd1ad3d68b9", + "txid": "1def5e113607a70cf95123a849f7d2520598ec31f63c4a8eff2dd1541efd0df9", + "hash": "1def5e113607a70cf95123a849f7d2520598ec31f63c4a8eff2dd1541efd0df9", "version": 1, - "size": 176, - "vsize": 176, + "size": 174, + "vsize": 174, "locktime": 0, "vin": [ { @@ -21,12 +21,12 @@ "value": 0.00200000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 feda50542e61108cf53b93dbffa0959f91ccb325 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914feda50542e61108cf53b93dbffa0959f91ccb32588ac", + "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL", + "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587", "reqSigs": 1, - "type": "pubkeyhash", + "type": "scripthash", "addresses": [ - "LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg" + "VM3caubzqsnbUmGvdgF5BBEWea77zPxt63" ] } }, @@ -40,5 +40,5 @@ } } ], - "hex": "0100000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d0300000000001976a914feda50542e61108cf53b93dbffa0959f91ccb32588ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" + "hex": "0100000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d03000000000017a91471ed53322d470bb96657deb786b94f97dd46fb15870084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" } diff --git a/test/util/data/txcreatedata2.hex b/test/util/data/txcreatedata2.hex index 63db0a9c6..426ea1f25 100644 --- a/test/util/data/txcreatedata2.hex +++ b/test/util/data/txcreatedata2.hex @@ -1 +1 @@ -0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d0300000000001976a914feda50542e61108cf53b93dbffa0959f91ccb32588ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 +0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d03000000000017a91471ed53322d470bb96657deb786b94f97dd46fb15870000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 diff --git a/test/util/data/txcreatedata2.json b/test/util/data/txcreatedata2.json index 5bb7679b9..8a5a35463 100644 --- a/test/util/data/txcreatedata2.json +++ b/test/util/data/txcreatedata2.json @@ -1,9 +1,9 @@ { - "txid": "17e220f41ed113fbca2b5ae97382018b54819990cb84d2004fe9099e64d2aa77", - "hash": "17e220f41ed113fbca2b5ae97382018b54819990cb84d2004fe9099e64d2aa77", + "txid": "792394048bf2847d2b0799322a4267654acca5383be6c6b82d780018b94ec901", + "hash": "792394048bf2847d2b0799322a4267654acca5383be6c6b82d780018b94ec901", "version": 2, - "size": 176, - "vsize": 176, + "size": 174, + "vsize": 174, "locktime": 0, "vin": [ { @@ -21,12 +21,12 @@ "value": 0.00200000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 feda50542e61108cf53b93dbffa0959f91ccb325 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914feda50542e61108cf53b93dbffa0959f91ccb32588ac", + "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL", + "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587", "reqSigs": 1, - "type": "pubkeyhash", + "type": "scripthash", "addresses": [ - "LiTVReQ6N8rWc2pNg2XMwCWq7A9P15teWg" + "VM3caubzqsnbUmGvdgF5BBEWea77zPxt63" ] } }, @@ -40,5 +40,5 @@ } } ], - "hex": "0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d0300000000001976a914feda50542e61108cf53b93dbffa0959f91ccb32588ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" + "hex": "0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d03000000000017a91471ed53322d470bb96657deb786b94f97dd46fb15870000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" } diff --git a/test/util/data/txcreatedata_seq0.hex b/test/util/data/txcreatedata_seq0.hex index 874c4d1c4..d2badbb2a 100644 --- a/test/util/data/txcreatedata_seq0.hex +++ b/test/util/data/txcreatedata_seq0.hex @@ -1 +1 @@ -0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000fdffffff01400d0300000000001976a914feda50542e61108cf53b93dbffa0959f91ccb32588ac00000000 +0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000fdffffff01400d03000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000 diff --git a/test/util/data/txcreatedata_seq0.json b/test/util/data/txcreatedata_seq0.json index 6e38a38cf..2b9cdffb5 100644 --- a/test/util/data/txcreatedata_seq0.json +++ b/test/util/data/txcreatedata_seq0.json @@ -1,9 +1,9 @@ { - "txid": "6d91ec40ccf2f0e1f4aad31d7a2eaeff34be2f78a743ce938eb285efbcafc3cd", - "hash": "6d91ec40ccf2f0e1f4aad31d7a2eaeff34be2f78a743ce938eb285efbcafc3cd", + "txid": "9bb3b6a96e77b012be9e1cd244df237dfa1b24cf6be7587e880a27d9e013791c", + "hash": "9bb3b6a96e77b012be9e1cd244df237dfa1b24cf6be7587e880a27d9e013791c", "version": 2, - "size": 85, - "vsize": 85, + "size": 83, + "vsize": 83, "locktime": 0, "vin": [ { @@ -21,15 +21,15 @@ "value": 0.00200000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 f9bbbf34117bfd1384c0708a13509f5599bb49e7 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914f9bbbf34117bfd1384c0708a13509f5599bb49e788ac", + "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL", + "hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87", "reqSigs": 1, - "type": "pubkeyhash", + "type": "scripthash", "addresses": [ - "LhzRRruapBx5gEtAf9RuVEePrzcG1wxRYa" + "VDFah8VXKvYGv8ScKjZDgTSbWh21JhXaa7" ] } } ], - "hex": "0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000fdffffff01400d0300000000001976a914f9bbbf34117bfd1384c0708a13509f5599bb49e788ac00000000" + "hex": "0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000fdffffff01400d03000000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000" } diff --git a/test/util/data/txcreatesignv1.hex b/test/util/data/txcreatesignv1.hex index 691fdbd36..011bb23d1 100644 --- a/test/util/data/txcreatesignv1.hex +++ b/test/util/data/txcreatesignv1.hex @@ -1 +1 @@ -0100000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a0860100000000001976a914834584e0afbd77db57fcf4a3a076b8d3e02aa6fb88ac00000000 +0100000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a08601000000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000 diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json index aa2160769..6ba4a9f46 100644 --- a/test/util/data/txcreatesignv1.json +++ b/test/util/data/txcreatesignv1.json @@ -1,9 +1,9 @@ { - "txid": "bf7c8b55745d4f9d9b2e33b5fbec5d08e38f3dcfc1838cb424a16db3ebc52f13", - "hash": "bf7c8b55745d4f9d9b2e33b5fbec5d08e38f3dcfc1838cb424a16db3ebc52f13", + "txid": "6a9a44aa08b368ca8ac2acf8dea522df4d94b31f59129f91b65b65866d1acc51", + "hash": "6a9a44aa08b368ca8ac2acf8dea522df4d94b31f59129f91b65b65866d1acc51", "version": 1, - "size": 85, - "vsize": 85, + "size": 83, + "vsize": 83, "locktime": 0, "vin": [ { @@ -21,15 +21,15 @@ "value": 0.00100000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 834584e0afbd77db57fcf4a3a076b8d3e02aa6fb OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914834584e0afbd77db57fcf4a3a076b8d3e02aa6fb88ac", + "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL", + "hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87", "reqSigs": 1, - "type": "pubkeyhash", + "type": "scripthash", "addresses": [ - "LXC44cQhuRufFtaDhDYv4q8nxQJBkUAsXp" + "VDFah8VXKvYGv8ScKjZDgTSbWh21JhXaa7" ] } } ], - "hex": "0100000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a0860100000000001976a914834584e0afbd77db57fcf4a3a076b8d3e02aa6fb88ac00000000" + "hex": "0100000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a08601000000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000" } diff --git a/test/util/data/txcreatesignv2.hex b/test/util/data/txcreatesignv2.hex index 0900c2728..4ecaa3a9c 100644 --- a/test/util/data/txcreatesignv2.hex +++ b/test/util/data/txcreatesignv2.hex @@ -1 +1 @@ -0200000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a0860100000000001976a914834584e0afbd77db57fcf4a3a076b8d3e02aa6fb88ac00000000 +0200000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a08601000000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000