Skip to content

Commit 6498ba1

Browse files
instagibbsinstagibbs
committed
transaction decoding infer output descriptors
1 parent e30b6ea commit 6498ba1

27 files changed

+46
-0
lines changed

Diff for: ‎doc/REST-interface.md

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ $ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff76
108108
"value" : 8.8687,
109109
"scriptPubKey" : {
110110
"asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG",
111+
"desc" : "addr(mi7as51dvLJsizWnTMurtRmrP8hG2m1XvD)#gj9tznmy"
111112
"hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac",
112113
"type" : "pubkeyhash",
113114
"address" : "mi7as51dvLJsizWnTMurtRmrP8hG2m1XvD"

Diff for: ‎src/core_write.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <consensus/consensus.h>
99
#include <consensus/validation.h>
1010
#include <key_io.h>
11+
#include <script/descriptor.h>
1112
#include <script/script.h>
1213
#include <script/standard.h>
1314
#include <serialize.h>
@@ -152,6 +153,7 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool include
152153
CTxDestination address;
153154

154155
out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
156+
out.pushKV("desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
155157
if (include_hex) out.pushKV("hex", HexStr(scriptPubKey));
156158

157159
std::vector<std::vector<unsigned char>> solns;

Diff for: ‎src/rpc/blockchain.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1331,6 +1331,7 @@ static RPCHelpMan gettxout()
13311331
{RPCResult::Type::STR_AMOUNT, "value", "The transaction value in " + CURRENCY_UNIT},
13321332
{RPCResult::Type::OBJ, "scriptPubKey", "", {
13331333
{RPCResult::Type::STR, "asm", ""},
1334+
{RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
13341335
{RPCResult::Type::STR_HEX, "hex", ""},
13351336
{RPCResult::Type::STR, "type", "The type, eg pubkeyhash"},
13361337
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},

Diff for: ‎src/rpc/rawtransaction.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ static RPCHelpMan getrawtransaction()
179179
{RPCResult::Type::OBJ, "scriptPubKey", "",
180180
{
181181
{RPCResult::Type::STR, "asm", "the asm"},
182+
{RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
182183
{RPCResult::Type::STR, "hex", "the hex"},
183184
{RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
184185
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
@@ -506,6 +507,7 @@ static RPCHelpMan decoderawtransaction()
506507
{RPCResult::Type::OBJ, "scriptPubKey", "",
507508
{
508509
{RPCResult::Type::STR, "asm", "the asm"},
510+
{RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
509511
{RPCResult::Type::STR_HEX, "hex", "the hex"},
510512
{RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
511513
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
@@ -561,6 +563,7 @@ static RPCHelpMan decodescript()
561563
RPCResult::Type::OBJ, "", "",
562564
{
563565
{RPCResult::Type::STR, "asm", "Script public key"},
566+
{RPCResult::Type::STR, "desc", "Inferred descriptor for the script"},
564567
{RPCResult::Type::STR, "type", "The output type (e.g. " + GetAllOutputTypes() + ")"},
565568
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
566569
{RPCResult::Type::STR, "p2sh", /*optional=*/true,
@@ -572,6 +575,7 @@ static RPCHelpMan decodescript()
572575
{RPCResult::Type::STR_HEX, "hex", "Hex string of the script public key"},
573576
{RPCResult::Type::STR, "type", "The type of the script public key (e.g. witness_v0_keyhash or witness_v0_scripthash)"},
574577
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
578+
{RPCResult::Type::STR, "desc", "Inferred descriptor for the script"},
575579
{RPCResult::Type::STR, "p2sh-segwit", "address of the P2SH script wrapping this witness redeem script"},
576580
}},
577581
},

Diff for: ‎test/functional/data/rpc_decodescript.json

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{
55
"asm": "1 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
66
"address": "bcrt1pamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhqz6nvlh",
7+
"desc": "addr(bcrt1pamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhqz6nvlh)#v52jnujz",
78
"type": "witness_v1_taproot"
89
}
910
],
@@ -12,6 +13,7 @@
1213
{
1314
"asm": "1 -28398",
1415
"address": "bcrt1pamhqk96edn",
16+
"desc": "addr(bcrt1pamhqk96edn)#vkh8uj5a",
1517
"type": "witness_unknown"
1618
}
1719
],
@@ -20,6 +22,7 @@
2022
{
2123
"asm": "0 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
2224
"address": "bcrt1qamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhqgdn98t",
25+
"desc": "addr(bcrt1qamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhwamhqgdn98t)#afaecevx",
2326
"type": "witness_v0_scripthash",
2427
"p2sh": "2MwGk8mw1GBP6U9D5X8gTvgvXpuknmAK3fo"
2528
}
@@ -29,38 +32,44 @@
2932
{
3033
"asm": "OP_HASH160 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee OP_EQUAL",
3134
"address": "2NF2b3KS8xXb9XHvbRMXdZh8s5g92rUZHtp",
35+
"desc": "addr(2NF2b3KS8xXb9XHvbRMXdZh8s5g92rUZHtp)#ywfcpmh9",
3236
"type": "scripthash"
3337
}
3438
],
3539
[
3640
"6a00",
3741
{
3842
"asm": "OP_RETURN 0",
43+
"desc": "raw(6a00)#ncfmkl43",
3944
"type": "nulldata"
4045
}
4146
],
4247
[
4348
"6aee",
4449
{
4550
"asm": "OP_RETURN OP_UNKNOWN",
51+
"desc": "raw(6aee)#vsyzgqdt",
4652
"type": "nonstandard"
4753
}
4854
],
4955
[
5056
"6a02ee",
5157
{
5258
"asm": "OP_RETURN [error]",
59+
"desc": "raw(6a02ee)#gvdwnlzl",
5360
"type": "nonstandard"
5461
}
5562
],
5663
[
5764
"02eeee",
5865
{
5966
"asm": "-28398",
67+
"desc": "raw(02eeee)#5xzck7pr",
6068
"type": "nonstandard",
6169
"p2sh": "2N34iiGoUUkVSPiaaTFpJjB1FR9TXQu3PGM",
6270
"segwit": {
6371
"asm": "0 96c2368fc30514a438a8bd909f93c49a1549d77198ccbdb792043b666cb24f42",
72+
"desc": "addr(bcrt1qjmprdr7rq522gw9ghkgfly7yng25n4m3nrxtmdujqsakvm9jfapqk795l5)#5akkdska",
6473
"hex": "002096c2368fc30514a438a8bd909f93c49a1549d77198ccbdb792043b666cb24f42",
6574
"address": "bcrt1qjmprdr7rq522gw9ghkgfly7yng25n4m3nrxtmdujqsakvm9jfapqk795l5",
6675
"type": "witness_v0_scripthash",
@@ -72,13 +81,15 @@
7281
"ba",
7382
{
7483
"asm": "OP_CHECKSIGADD",
84+
"desc": "raw(ba)#yy0eg44l",
7585
"type": "nonstandard"
7686
}
7787
],
7888
[
7989
"50",
8090
{
8191
"asm": "OP_RESERVED",
92+
"desc": "raw(50)#a7tu03xf",
8293
"type": "nonstandard"
8394
}
8495
]

Diff for: ‎test/util/data/tt-delin1-out.json

+2
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
"n": 0,
195195
"scriptPubKey": {
196196
"asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
197+
"desc": "addr(1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o)#xvg87vgr",
197198
"hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
198199
"address": "1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o",
199200
"type": "pubkeyhash"
@@ -204,6 +205,7 @@
204205
"n": 1,
205206
"scriptPubKey": {
206207
"asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
208+
"desc": "addr(1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb)#tsyprkms",
207209
"hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
208210
"address": "1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb",
209211
"type": "pubkeyhash"

Diff for: ‎test/util/data/tt-delout1-out.json

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
"n": 0,
204204
"scriptPubKey": {
205205
"asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
206+
"desc": "addr(1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o)#xvg87vgr",
206207
"hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
207208
"address": "1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o",
208209
"type": "pubkeyhash"

Diff for: ‎test/util/data/tt-locktime317000-out.json

+2
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
"n": 0,
204204
"scriptPubKey": {
205205
"asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
206+
"desc": "addr(1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o)#xvg87vgr",
206207
"hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
207208
"address": "1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o",
208209
"type": "pubkeyhash"
@@ -213,6 +214,7 @@
213214
"n": 1,
214215
"scriptPubKey": {
215216
"asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
217+
"desc": "addr(1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb)#tsyprkms",
216218
"hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
217219
"address": "1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb",
218220
"type": "pubkeyhash"

Diff for: ‎test/util/data/txcreate1.json

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"n": 0,
4242
"scriptPubKey": {
4343
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
44+
"desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
4445
"hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
4546
"address": "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
4647
"type": "pubkeyhash"
@@ -51,6 +52,7 @@
5152
"n": 1,
5253
"scriptPubKey": {
5354
"asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG",
55+
"desc": "addr(1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46)#vdmdu766",
5456
"hex": "76a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac",
5557
"address": "1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46",
5658
"type": "pubkeyhash"

Diff for: ‎test/util/data/txcreate2.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "",
17+
"desc": "raw()#58lrscpx",
1718
"hex": "",
1819
"type": "nonstandard"
1920
}

Diff for: ‎test/util/data/txcreatedata1.json

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"n": 0,
2424
"scriptPubKey": {
2525
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
26+
"desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
2627
"hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
2728
"address": "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
2829
"type": "pubkeyhash"
@@ -33,6 +34,7 @@
3334
"n": 1,
3435
"scriptPubKey": {
3536
"asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
37+
"desc": "raw(6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e)#zf2avljj",
3638
"hex": "6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
3739
"type": "nulldata"
3840
}

Diff for: ‎test/util/data/txcreatedata2.json

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"n": 0,
2424
"scriptPubKey": {
2525
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
26+
"desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
2627
"hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
2728
"address": "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
2829
"type": "pubkeyhash"
@@ -33,6 +34,7 @@
3334
"n": 1,
3435
"scriptPubKey": {
3536
"asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
37+
"desc": "raw(6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e)#zf2avljj",
3638
"hex": "6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
3739
"type": "nulldata"
3840
}

Diff for: ‎test/util/data/txcreatedata_seq0.json

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"n": 0,
2424
"scriptPubKey": {
2525
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
26+
"desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
2627
"hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
2728
"address": "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
2829
"type": "pubkeyhash"

Diff for: ‎test/util/data/txcreatedata_seq1.json

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"n": 0,
3333
"scriptPubKey": {
3434
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
35+
"desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
3536
"hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
3637
"address": "13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
3738
"type": "pubkeyhash"

Diff for: ‎test/util/data/txcreatemultisig1.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG",
17+
"desc": "multi(2,02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397,021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d,02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485)#8s88p9pl",
1718
"hex": "522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae",
1819
"type": "multisig"
1920
}

Diff for: ‎test/util/data/txcreatemultisig2.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL",
17+
"desc": "addr(34HNh57oBCRKkxNyjTuWAJkTbuGh6jg2Ms)#ngnz8933",
1718
"hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87",
1819
"address": "34HNh57oBCRKkxNyjTuWAJkTbuGh6jg2Ms",
1920
"type": "scripthash"

Diff for: ‎test/util/data/txcreatemultisig3.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "0 e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",
17+
"desc": "addr(bc1qu9dgdg330r6r84g5mw7wqshg04exv2uttmw2elfwx74h5tgntuzs44gyfg)#yvt39j9m",
1718
"hex": "0020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",
1819
"address": "bc1qu9dgdg330r6r84g5mw7wqshg04exv2uttmw2elfwx74h5tgntuzs44gyfg",
1920
"type": "witness_v0_scripthash"

Diff for: ‎test/util/data/txcreatemultisig4.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_HASH160 6edf12858999f0dae74f9c692e6694ee3621b2ac OP_EQUAL",
17+
"desc": "addr(3BoFUz1StqcNcgUTZE5cC1eFhuYFzj3fGH)#466tx6fn",
1718
"hex": "a9146edf12858999f0dae74f9c692e6694ee3621b2ac87",
1819
"address": "3BoFUz1StqcNcgUTZE5cC1eFhuYFzj3fGH",
1920
"type": "scripthash"

Diff for: ‎test/util/data/txcreatemultisig5.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_HASH160 a4051c02398868af83f28f083208fae99a769263 OP_EQUAL",
17+
"desc": "addr(3GeGs1eHUxPz5YyuFe9WPpXid2UsUb5Jos)#juhnnegr",
1718
"hex": "a914a4051c02398868af83f28f083208fae99a76926387",
1819
"address": "3GeGs1eHUxPz5YyuFe9WPpXid2UsUb5Jos",
1920
"type": "scripthash"

Diff for: ‎test/util/data/txcreateoutpubkey1.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG",
17+
"desc": "pk(02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397)#rk5v7uqw",
1718
"hex": "2102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac",
1819
"type": "pubkey"
1920
}

Diff for: ‎test/util/data/txcreateoutpubkey2.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "0 a2516e770582864a6a56ed21a102044e388c62e3",
17+
"desc": "addr(bc1q5fgkuac9s2ry56jka5s6zqsyfcugcchry5cwu0)#gm7zhxq2",
1718
"hex": "0014a2516e770582864a6a56ed21a102044e388c62e3",
1819
"address": "bc1q5fgkuac9s2ry56jka5s6zqsyfcugcchry5cwu0",
1920
"type": "witness_v0_keyhash"

Diff for: ‎test/util/data/txcreateoutpubkey3.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_HASH160 a5ab14c9804d0d8bf02f1aea4e82780733ad0a83 OP_EQUAL",
17+
"desc": "addr(3GnzN8FqgvYGYdhj8NW6UNxxVv3Uj1ApQn)#zsln680u",
1718
"hex": "a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a8387",
1819
"address": "3GnzN8FqgvYGYdhj8NW6UNxxVv3Uj1ApQn",
1920
"type": "scripthash"

Diff for: ‎test/util/data/txcreatescript1.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_DROP",
17+
"desc": "raw(75)#ppey0zqj",
1718
"hex": "75",
1819
"type": "nonstandard"
1920
}

Diff for: ‎test/util/data/txcreatescript2.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL",
17+
"desc": "addr(3C5QarEGh9feKbDJ3QbMf2YNjnMoiPDhNp)#5mx9waq3",
1718
"hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587",
1819
"address": "3C5QarEGh9feKbDJ3QbMf2YNjnMoiPDhNp",
1920
"type": "scripthash"

Diff for: ‎test/util/data/txcreatescript3.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "0 0bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",
17+
"desc": "addr(bc1qp0lfxhnscvsu0j36l36uurgv5tuck4pzuqytkvwqp3kh78cupttqyf705v)#s4fdh9tu",
1718
"hex": "00200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",
1819
"address": "bc1qp0lfxhnscvsu0j36l36uurgv5tuck4pzuqytkvwqp3kh78cupttqyf705v",
1920
"type": "witness_v0_scripthash"

Diff for: ‎test/util/data/txcreatescript4.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"n": 0,
1515
"scriptPubKey": {
1616
"asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL",
17+
"desc": "addr(3BNQbeFeJJGMAyDxPwWPuqxPMrjsFLjk3f)#fdleltnv",
1718
"hex": "a9146a2c482f4985f57e702f325816c90e3723ca81ae87",
1819
"address": "3BNQbeFeJJGMAyDxPwWPuqxPMrjsFLjk3f",
1920
"type": "scripthash"

Diff for: ‎test/util/data/txcreatesignv1.json

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"n": 0,
2424
"scriptPubKey": {
2525
"asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",
26+
"desc": "addr(193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7)#nw04wh58",
2627
"hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac",
2728
"address": "193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7",
2829
"type": "pubkeyhash"

0 commit comments

Comments
 (0)