From 6aad5e1c7f551b7e402dadf8963f55ebcb302126 Mon Sep 17 00:00:00 2001 From: bytzck <82664078+bytzck@users.noreply.github.com> Date: Wed, 9 Jun 2021 05:39:14 +0100 Subject: [PATCH] test/util checks for make check now working (#31) --- test/util/data/bitcoin-util-test.json | 79 +++++++++++------------ test/util/data/tt-delin1-out.json | 4 +- test/util/data/tt-delout1-out.json | 2 +- test/util/data/tt-locktime317000-out.json | 4 +- test/util/data/txcreate1.hex | 2 +- test/util/data/txcreate1.json | 12 ++-- test/util/data/txcreate2.hex | 2 +- test/util/data/txcreate2.json | 6 +- test/util/data/txcreatedata1.hex | 2 +- test/util/data/txcreatedata1.json | 10 +-- test/util/data/txcreatedata2.hex | 2 +- test/util/data/txcreatedata2.json | 10 +-- test/util/data/txcreatedata_seq0.hex | 2 +- test/util/data/txcreatedata_seq0.json | 10 +-- test/util/data/txcreatedata_seq1.json | 2 +- test/util/data/txcreatemultisig1.json | 6 +- test/util/data/txcreatemultisig2.json | 2 +- test/util/data/txcreateoutpubkey1.json | 2 +- test/util/data/txcreatescript2.hex | 2 +- test/util/data/txcreatescript2.json | 8 +-- test/util/data/txcreatesignv1.hex | 2 +- test/util/data/txcreatesignv1.json | 18 +++--- test/util/data/txcreatesignv2.hex | 2 +- 23 files changed, 95 insertions(+), 96 deletions(-) diff --git a/test/util/data/bitcoin-util-test.json b/test/util/data/bitcoin-util-test.json index 2e21ae2f6b96cb..f56190f663806e 100644 --- a/test/util/data/bitcoin-util-test.json +++ b/test/util/data/bitcoin-util-test.json @@ -10,13 +10,12 @@ "description": "Creates a blank v1 transaction (output in json)" }, { "exec": "./wagerr-tx", - "args": ["-"], - "input": "blanktxv2.hex", + "args": ["-create", "nversion=2"], "output_cmp": "blanktxv2.hex", "description": "Creates a blank transaction when nothing is piped into wagerr-tx" }, { "exec": "./wagerr-tx", - "args": ["-json","-create"], + "args": ["-json","-create", "nversion=2"], "output_cmp": "blanktxv2.json", "description": "Creates a blank transaction (output in json)" }, @@ -121,7 +120,7 @@ { "exec": "./wagerr-tx", "args": ["-create", - "outaddr=1:Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw:garbage"], + "outaddr=1:sU8uqD2gX6fm5eRvgUxPbRKpGJ24CMCSgE:garbage"], "return_code": 1, "error_txt": "error: TX output missing or too many separators", "description": "Malformed outaddr argument (too many separators). Expected to fail." @@ -144,24 +143,24 @@ }, { "exec": "./wagerr-tx", "args": - ["-create", + ["-create", "nversion=2", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", "in=bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c:18", "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1", - "outaddr=0.18:Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw", - "outaddr=4:XxppMBDQ6SiJrKcBrAy4WkkNdrxDBfzFdZ"], + "outaddr=0.18:sM9JNsURmybh5x7VyXwHE7fCKduuZFMScN", + "outaddr=4:sU8uqD2gX6fm5eRvgUxPbRKpGJ24CMCSgE"], "output_cmp": "txcreate1.hex", "description": "Creates a new transaction with three inputs and two outputs" }, { "exec": "./wagerr-tx", "args": ["-json", - "-create", + "-create", "nversion=2", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", "in=bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c:18", "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1", - "outaddr=0.18:Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw", - "outaddr=4:XxppMBDQ6SiJrKcBrAy4WkkNdrxDBfzFdZ"], + "outaddr=0.18:sM9JNsURmybh5x7VyXwHE7fCKduuZFMScN", + "outaddr=4:sU8uqD2gX6fm5eRvgUxPbRKpGJ24CMCSgE"], "output_cmp": "txcreate1.json", "description": "Creates a new transaction with three inputs and two outputs (output in json)" }, @@ -186,33 +185,33 @@ "description": "Create a new transaction with a single output script (OP_DROP) (output as json)" }, { "exec": "./wagerr-tx", - "args": ["-create", "outscript=0:OP_DROP:S", "nversion=1"], + "args": ["-create", "outscript=0:OP_DROP:S", "nversion=2"], "output_cmp": "txcreatescript2.hex", "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH" }, { "exec": "./wagerr-tx", - "args": ["-json", "-create", "outscript=0:OP_DROP:S", "nversion=1"], + "args": ["-json", "-create", "outscript=0:OP_DROP:S", "nversion=2"], "output_cmp": "txcreatescript2.json", "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH (output as json)" }, { "exec": "./wagerr-tx", - "args": ["02000000000100000000000000000000000000"], + "args": ["01000000000100000000000000000000000000"], "output_cmp": "txcreate2.hex", "description": "Parses a transaction with no inputs and a single output script" }, { "exec": "./wagerr-tx", - "args": ["-json", "02000000000100000000000000000000000000"], + "args": ["-json", "01000000000100000000000000000000000000"], "output_cmp": "txcreate2.json", "description": "Parses a transaction with no inputs and a single output script (output in json)" }, { "exec": "./wagerr-tx", "args": ["-create", "nversion=1", - "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", - "set=privatekeys:[\"7qYrzJZWqnyCWMYswFcqaRJypGdVceudXPSxmZKsngN7fyo7aAV\"]", - "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]", + "in=924492787e3c43699a845d4cd2bdaea95fa3db81943b0b4325ac07e275bdcb38:0", + "set=privatekeys:[\"MncgKh8PvSYufYLQMankt6EsybFnw2SepY6A6ra3bdeTQEAhctWY\"]", + "set=prevtxs:[{\"txid\":\"d71b9105d185de8b0859d4a85694f3dab19aad401de7c7c52f96ff464af35559\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]", "sign=ALL", - "outaddr=0.001:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk"], + "outaddr=0.001:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd"], "output_cmp": "txcreatesignv1.hex", "description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction" }, @@ -220,33 +219,33 @@ "args": ["-json", "-create", "nversion=1", - "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", - "set=privatekeys:[\"7qYrzJZWqnyCWMYswFcqaRJypGdVceudXPSxmZKsngN7fyo7aAV\"]", - "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]", + "in=924492787e3c43699a845d4cd2bdaea95fa3db81943b0b4325ac07e275bdcb38:0", + "set=privatekeys:[\"MncgKh8PvSYufYLQMankt6EsybFnw2SepY6A6ra3bdeTQEAhctWY\"]", + "set=prevtxs:[{\"txid\":\"d71b9105d185de8b0859d4a85694f3dab19aad401de7c7c52f96ff464af35559\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]", "sign=ALL", - "outaddr=0.001:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk"], + "outaddr=0.001:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd"], "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)" }, { "exec": "./wagerr-tx", "args": - ["-create", + ["-create", "nversion=2", "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", - "set=privatekeys:[\"7qYrzJZWqnyCWMYswFcqaRJypGdVceudXPSxmZKsngN7fyo7aAV\"]", + "set=privatekeys:[\"MncgKh8PvSYufYLQMankt6EsybFnw2SepY6A6ra3bdeTQEAhctWY\"]", "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]", "sign=ALL", - "outaddr=0.001:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk"], + "outaddr=0.001:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd"], "output_cmp": "txcreatesignv2.hex", "description": "Creates a new transaction with a single input and a single output, and then signs the transaction" }, { "exec": "./wagerr-tx", "args": - ["-create", + ["-create", "nversion=2", "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", - "set=privatekeys:[\"7qYrzJZWqnyCWMYswFcqaRJypGdVceudXPSxmZKsngN7fyo7aAV\"]", + "set=privatekeys:[\"MncgKh8PvSYufYLQMankt6EsybFnw2SepY6A6ra3bdeTQEAhctWY\"]", "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":\"0foo\",\"scriptPubKey\":\"76a91491b24bf9f5288532960ac687abb035127b1d28a588ac\"}]", "sign=ALL", - "outaddr=0.001:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk"], + "outaddr=0.001:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd"], "return_code": 1, "error_txt": "error: prevtxs internal object typecheck fail", "description": "Tests the check for invalid vout index in prevtxs for sign" @@ -285,7 +284,7 @@ "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", - "outaddr=0.18:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk", + "outaddr=0.18:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd", "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata1.hex", "description": "Creates a new transaction with one input, one address output and one data output" @@ -295,16 +294,16 @@ ["-json", "-create", "nversion=1", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", - "outaddr=0.18:Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw", + "outaddr=0.18:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd", "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)" }, { "exec": "./wagerr-tx", "args": - ["-create", + ["-create", "nversion=2", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", - "outaddr=0.18:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk", + "outaddr=0.18:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd", "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata2.hex", "description": "Creates a new transaction with one input, one address output and one data (zero value) output" @@ -312,27 +311,27 @@ { "exec": "./wagerr-tx", "args": ["-json", - "-create", + "-create", "nversion=2", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", - "outaddr=0.18:Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw", + "outaddr=0.18:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd", "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)" }, { "exec": "./wagerr-tx", "args": - ["-create", + ["-create", "nversion=2", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293", - "outaddr=0.18:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk"], + "outaddr=0.18:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd"], "output_cmp": "txcreatedata_seq0.hex", "description": "Creates a new transaction with one input with sequence number and one address output" }, { "exec": "./wagerr-tx", "args": ["-json", - "-create", + "-create", "nversion=2", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293", - "outaddr=0.18:Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw"], + "outaddr=0.18:sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd"], "output_cmp": "txcreatedata_seq0.json", "description": "Creates a new transaction with one input with sequence number and one address output (output in json)" }, @@ -362,12 +361,12 @@ "description": "Creates a new transaction with a single 2-of-3 multisig output (output in json)" }, { "exec": "./wagerr-tx", - "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"], + "args": ["-create", "nversion=2", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"], "output_cmp": "txcreatemultisig2.hex", "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output" }, { "exec": "./wagerr-tx", - "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"], + "args": ["-json", "-create", "nversion=2", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"], "output_cmp": "txcreatemultisig2.json", "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output (output in json)" } diff --git a/test/util/data/tt-delin1-out.json b/test/util/data/tt-delin1-out.json index f43983eb11644b..ea2f3f6edc4cc6 100644 --- a/test/util/data/tt-delin1-out.json +++ b/test/util/data/tt-delin1-out.json @@ -197,7 +197,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs" + "sXMqMFRZzkCk1fzAxs8Z8ihpT22GSZ7SA9" ] } }, @@ -211,7 +211,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XkaMatRZjFxq1QbgUvdmqGzGRaPqSLvvS6" + "sU8uqD2gX6fm5eRvgUxPbRKpGJ24CMCSgE" ] } } diff --git a/test/util/data/tt-delout1-out.json b/test/util/data/tt-delout1-out.json index 9fd11c7d570e86..2d3dade9726509 100644 --- a/test/util/data/tt-delout1-out.json +++ b/test/util/data/tt-delout1-out.json @@ -206,7 +206,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs" + "sXMqMFRZzkCk1fzAxs8Z8ihpT22GSZ7SA9" ] } } diff --git a/test/util/data/tt-locktime317000-out.json b/test/util/data/tt-locktime317000-out.json index a7add31ad77822..2a45d97e512815 100644 --- a/test/util/data/tt-locktime317000-out.json +++ b/test/util/data/tt-locktime317000-out.json @@ -206,7 +206,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs" + "sXMqMFRZzkCk1fzAxs8Z8ihpT22GSZ7SA9" ] } }, @@ -220,7 +220,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XkaMatRZjFxq1QbgUvdmqGzGRaPqSLvvS6" + "sU8uqD2gX6fm5eRvgUxPbRKpGJ24CMCSgE" ] } } diff --git a/test/util/data/txcreate1.hex b/test/util/data/txcreate1.hex index 9ec6ee3531b7b2..e4a016ab9f5090 100644 --- a/test/util/data/txcreate1.hex +++ b/test/util/data/txcreate1.hex @@ -1 +1 @@ -02000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000 +02000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac00000000 diff --git a/test/util/data/txcreate1.json b/test/util/data/txcreate1.json index fd0d08fc02075e..4785ceec7c0af9 100644 --- a/test/util/data/txcreate1.json +++ b/test/util/data/txcreate1.json @@ -1,5 +1,5 @@ { - "txid": "fe7d174f42dce0cffa7a527e9bc8368956057619ec817648f6138b98f2533e8f", + "txid": "f15ddc8d255c377453ade78873ff567ca62273a7785924c41edd4e4b1bcb0b16", "version": 2, "type": 0, "size": 201, @@ -44,7 +44,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw" + "sM9JNsURmybh5x7VyXwHE7fCKduuZFMScN" ] } }, @@ -53,15 +53,15 @@ "valueSat": 400000000, "n": 1, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac", + "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XxppMBDQ6SiJrKcBrAy4WkkNdrxDBfzFdZ" + "sU8uqD2gX6fm5eRvgUxPbRKpGJ24CMCSgE" ] } } ], - "hex": "02000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000" + "hex": "02000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac00000000" } diff --git a/test/util/data/txcreate2.hex b/test/util/data/txcreate2.hex index 38bb7b104665a7..5243c2d02e8b5a 100644 --- a/test/util/data/txcreate2.hex +++ b/test/util/data/txcreate2.hex @@ -1 +1 @@ -02000000000100000000000000000000000000 +01000000000100000000000000000000000000 diff --git a/test/util/data/txcreate2.json b/test/util/data/txcreate2.json index 9096dd06b130fc..4f29cc5997f63d 100644 --- a/test/util/data/txcreate2.json +++ b/test/util/data/txcreate2.json @@ -1,6 +1,6 @@ { - "txid": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715", - "version": 2, + "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13", + "version": 1, "type": 0, "size": 19, "locktime": 0, @@ -18,5 +18,5 @@ } } ], - "hex": "02000000000100000000000000000000000000" + "hex": "01000000000100000000000000000000000000" } diff --git a/test/util/data/txcreatedata1.hex b/test/util/data/txcreatedata1.hex index 8327a4aa590563..362a717ff6c432 100644 --- a/test/util/data/txcreatedata1.hex +++ b/test/util/data/txcreatedata1.hex @@ -1 +1 @@ -02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 +01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 diff --git a/test/util/data/txcreatedata1.json b/test/util/data/txcreatedata1.json index 8fe1c75a57db4a..37909787fe5c81 100644 --- a/test/util/data/txcreatedata1.json +++ b/test/util/data/txcreatedata1.json @@ -1,5 +1,5 @@ { - "txid": "07894b4d12fe7853dd911402db1620920d261b9627c447f931417d330c25f06e", + "txid": "9dd61dac026b956f9b7dbdac3bb6f2d3361347031953173097057cba5f0f49a8", "version": 1, "type": 0, "size": 176, @@ -21,12 +21,12 @@ "valueSat": 18000000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac", + "asm": "OP_DUP OP_HASH160 60fbd9176baf3fe58146be1b19264aec63027dff OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a91460fbd9176baf3fe58146be1b19264aec63027dff88ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw" + "sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd" ] } }, @@ -41,5 +41,5 @@ } } ], - "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" + "hex": "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" } diff --git a/test/util/data/txcreatedata2.hex b/test/util/data/txcreatedata2.hex index 88f7a10d38658c..ee2fc1e0b7b1bd 100644 --- a/test/util/data/txcreatedata2.hex +++ b/test/util/data/txcreatedata2.hex @@ -1 +1 @@ -02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 +02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000 diff --git a/test/util/data/txcreatedata2.json b/test/util/data/txcreatedata2.json index de636c1c7c6488..96339b19bc09bf 100644 --- a/test/util/data/txcreatedata2.json +++ b/test/util/data/txcreatedata2.json @@ -1,5 +1,5 @@ { - "txid": "c14b007fa3a6c1e7765919c1d14c1cfc2b8642c3a5d3be4b1fa8c4ccfec98bb0", + "txid": "0da00698525fe3455a55913c55415c3d3bbe73f9171030fb193a3c36a5771e89", "version": 2, "type": 0, "size": 176, @@ -21,12 +21,12 @@ "valueSat": 18000000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac", + "asm": "OP_DUP OP_HASH160 60fbd9176baf3fe58146be1b19264aec63027dff OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a91460fbd9176baf3fe58146be1b19264aec63027dff88ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw" + "sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd" ] } }, @@ -41,5 +41,5 @@ } } ], - "hex": "02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" + "hex": "02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff0280a81201000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000" } diff --git a/test/util/data/txcreatedata_seq0.hex b/test/util/data/txcreatedata_seq0.hex index 7dce523c79603e..5cef8c05825290 100644 --- a/test/util/data/txcreatedata_seq0.hex +++ b/test/util/data/txcreatedata_seq0.hex @@ -1 +1 @@ -02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000 +02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac00000000 diff --git a/test/util/data/txcreatedata_seq0.json b/test/util/data/txcreatedata_seq0.json index 9383335396d37f..88534c98675d24 100644 --- a/test/util/data/txcreatedata_seq0.json +++ b/test/util/data/txcreatedata_seq0.json @@ -1,5 +1,5 @@ { - "txid": "8df6ed527472542dd5e137c242a7c5a9f337ac34f7b257ae4af886aeaebb51b0", + "txid": "89fbe402873a4411a9bc41f36aec53ee924bc36f3a54a342a4a9c921672d2fd0", "version": 2, "type": 0, "size": 85, @@ -21,15 +21,15 @@ "valueSat": 18000000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac", + "asm": "OP_DUP OP_HASH160 60fbd9176baf3fe58146be1b19264aec63027dff OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a91460fbd9176baf3fe58146be1b19264aec63027dff88ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw" + "sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd" ] } } ], - "hex": "02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000" + "hex": "02000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac00000000" } diff --git a/test/util/data/txcreatedata_seq1.json b/test/util/data/txcreatedata_seq1.json index 0d3e99cb212f4f..d4b88399dad626 100644 --- a/test/util/data/txcreatedata_seq1.json +++ b/test/util/data/txcreatedata_seq1.json @@ -35,7 +35,7 @@ "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw" + "sM9JNsURmybh5x7VyXwHE7fCKduuZFMScN" ] } } diff --git a/test/util/data/txcreatemultisig1.json b/test/util/data/txcreatemultisig1.json index e295821991f6d4..f92c745bc825c2 100644 --- a/test/util/data/txcreatemultisig1.json +++ b/test/util/data/txcreatemultisig1.json @@ -17,9 +17,9 @@ "reqSigs": 2, "type": "multisig", "addresses": [ - "XqV6rHmzCyFUKF2jSVg8ZkZ7oRhGLVxifK", - "XqDjpPyN61bMZAZsVbYyvouVzgV59oSmWp", - "Xe2kRBG5ZEn8T34TqvvPKwQwHEzVL9WvxH" + "sZ3f6cP6zoxQPUrye3zkKttfe9KVDQyrLS", + "sYnJ4iaUsrJHdQQ7h9sbgxF3qQ7HxqwpJ7", + "sMbJfVsCM5V4XGti3VF165kV7xciA8WcPA" ] } } diff --git a/test/util/data/txcreatemultisig2.json b/test/util/data/txcreatemultisig2.json index b815a54a63c68a..f52530c8224801 100644 --- a/test/util/data/txcreatemultisig2.json +++ b/test/util/data/txcreatemultisig2.json @@ -17,7 +17,7 @@ "reqSigs": 1, "type": "scripthash", "addresses": [ - "7V11XGPxzBWxkiuw15a1Vgk7XT74tyYtCY" + "8HgDVUzYQYSiPbC73vEeTwHgnTcxJaHLQN" ] } } diff --git a/test/util/data/txcreateoutpubkey1.json b/test/util/data/txcreateoutpubkey1.json index c7699b2ac60410..bd5dc6dbbc4b76 100644 --- a/test/util/data/txcreateoutpubkey1.json +++ b/test/util/data/txcreateoutpubkey1.json @@ -17,7 +17,7 @@ "reqSigs": 1, "type": "pubkey", "addresses": [ - "XqV6rHmzCyFUKF2jSVg8ZkZ7oRhGLVxifK" + "sZ3f6cP6zoxQPUrye3zkKttfe9KVDQyrLS" ] } } diff --git a/test/util/data/txcreatescript2.hex b/test/util/data/txcreatescript2.hex index 5afe8786e39cb4..68954c7ae1f656 100644 --- a/test/util/data/txcreatescript2.hex +++ b/test/util/data/txcreatescript2.hex @@ -1 +1 @@ -010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000 +020000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000 diff --git a/test/util/data/txcreatescript2.json b/test/util/data/txcreatescript2.json index 258b42f6708d9b..dc502a379b3b54 100644 --- a/test/util/data/txcreatescript2.json +++ b/test/util/data/txcreatescript2.json @@ -1,6 +1,6 @@ { - "txid": "6e07a7cc075e0703f32ee8c4e5373fe654bfbc315148fda364e1be286ff290d0", - "version": 1, + "txid": "922c1a3673f31d033b2f18da4990127f212056d60c421ec4a70c02ec73e4c973", + "version": 2, "type": 0, "size": 42, "locktime": 0, @@ -17,10 +17,10 @@ "reqSigs": 1, "type": "scripthash", "addresses": [ - "7co3R3WSW8mHKMkFK2FrzQY2fLCBWsg56D" + "8RUFPG71vVh2xE2RMrvVxf5bvLi4ztZ5b1" ] } } ], - "hex": "010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000" + "hex": "020000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000" } diff --git a/test/util/data/txcreatesignv1.hex b/test/util/data/txcreatesignv1.hex index a46fcc88cbc99d..50fc15ba7eb9aa 100644 --- a/test/util/data/txcreatesignv1.hex +++ b/test/util/data/txcreatesignv1.hex @@ -1 +1 @@ -01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000 +010000000138cbbd75e207ac25430b3b9481dba35fa9aebdd24c5d849a69433c7e789244920000000000ffffffff01a0860100000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac00000000 diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json index 5072b9e7039225..a95fd92b708593 100644 --- a/test/util/data/txcreatesignv1.json +++ b/test/util/data/txcreatesignv1.json @@ -1,16 +1,16 @@ { - "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af", + "txid": "d71b9105d185de8b0859d4a85694f3dab19aad401de7c7c52f96ff464af35559", "version": 1, "type": 0, - "size": 224, + "size": 85, "locktime": 0, "vin": [ { - "txid": "4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485", + "txid": "924492787e3c43699a845d4cd2bdaea95fa3db81943b0b4325ac07e275bdcb38", "vout": 0, "scriptSig": { - "asm": "304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e2[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8", - "hex": "48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8" + "asm": "", + "hex": "" }, "sequence": 4294967295 } @@ -21,15 +21,15 @@ "valueSat": 100000, "n": 0, "scriptPubKey": { - "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG", - "hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac", + "asm": "OP_DUP OP_HASH160 60fbd9176baf3fe58146be1b19264aec63027dff OP_EQUALVERIFY OP_CHECKSIG", + "hex": "76a91460fbd9176baf3fe58146be1b19264aec63027dff88ac", "reqSigs": 1, "type": "pubkeyhash", "addresses": [ - "XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk" + "sT6CehN2zH33iyB92wzum4FJ7gVbwQo9Hd" ] } } ], - "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000" + "hex": "010000000138cbbd75e207ac25430b3b9481dba35fa9aebdd24c5d849a69433c7e789244920000000000ffffffff01a0860100000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac00000000" } diff --git a/test/util/data/txcreatesignv2.hex b/test/util/data/txcreatesignv2.hex index ee425cd98c5d1a..f1ff615ff5bd4b 100644 --- a/test/util/data/txcreatesignv2.hex +++ b/test/util/data/txcreatesignv2.hex @@ -1 +1 @@ -02000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008a473044022079c7aa014177a2e973caf6df7c7b8f15399083b91eba370ea1e19c4caed9181e02205f8f8763505ce8e6cbdd2cd28fab3fd407a75003e7d0dc04e6bebb0a3c89e7cb01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000 +02000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d0000000000ffffffff01a0860100000000001976a91460fbd9176baf3fe58146be1b19264aec63027dff88ac00000000