Merge bitcoin#16795: rpc: have raw transaction decoding infer output descriptors

achow101 · knst · commit 68efe466c84c · 2025-05-14T15:11:39.000+07:00
6498ba1 transaction decoding infer output descriptors (Gregory Sanders) Pull request description: Following discussion in bitcoin#16725 this is complementary data to expose. All outputs are inferred. ACKs for top commit: achow101: ACK 6498ba1 meshcollider: utACK 6498ba1 Tree-SHA512: 36664117ddbe46d5fdde7ed6541ef2c9d8dfb7a3636b97f363bf1c325096fe00d9d2acea2d1917ea19fdb82f1ea296c12e440c5c703d6a9bfc1a02fba028bcd8
diff --git a/doc/REST-interface.md b/doc/REST-interface.md
@@ -111,6 +111,7 @@ $ curl localhost:19998/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff76
          "value" : 8.8687,
          "scriptPubKey" : {
             "asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG",
+            "desc" : "addr(mi7as51dvLJsizWnTMurtRmrP8hG2m1XvD)#gj9tznmy"
             "hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac",
             "type" : "pubkeyhash",
             "address" : "mi7as51dvLJsizWnTMurtRmrP8hG2m1XvD"
diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -8,6 +8,7 @@
 #include <consensus/validation.h>
 #include <key_io.h>
 #include <primitives/transaction.h>
+#include <script/descriptor.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <serialize.h>
@@ -162,6 +163,7 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool include
     CTxDestination address;
 
     out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
+    out.pushKV("desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
     if (include_hex) out.pushKV("hex", HexStr(scriptPubKey));
 
     std::vector<std::vector<unsigned char>> solns;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1250,6 +1250,7 @@ static RPCHelpMan gettxout()
                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                     {
                         {RPCResult::Type::STR, "asm", ""},
+                        {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
                         {RPCResult::Type::STR_HEX, "hex", ""},
                         {RPCResult::Type::STR_HEX, "type", "The type, eg pubkeyhash"},
                         {RPCResult::Type::STR, "address", /* optional */ true, "Dash address (only if a well-defined address exists)"},
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -212,6 +212,7 @@ static RPCHelpMan getrawtransaction()
                                     {RPCResult::Type::OBJ, "scriptPubKey", "",
                                     {
                                         {RPCResult::Type::STR, "asm", "the asm"},
+                                        {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
                                         {RPCResult::Type::STR, "hex", "the hex"},
                                         {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                                         {RPCResult::Type::STR, "address", /* optional */ true, "The Dash address (only if a well-defined address exists)"},
@@ -764,6 +765,7 @@ static RPCHelpMan decoderawtransaction()
                                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                                 {
                                     {RPCResult::Type::STR, "asm", "the asm"},
+                                    {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
                                     {RPCResult::Type::STR_HEX, "hex", "the hex"},
                                     {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                                     {RPCResult::Type::STR, "address", /* optional */ true, "The Dash address (only if a well-defined address exists)"},
@@ -807,6 +809,7 @@ static RPCHelpMan decodescript()
             RPCResult::Type::OBJ, "", "",
             {
                 {RPCResult::Type::STR, "asm", "Script public key"},
+                {RPCResult::Type::STR, "desc", "Inferred descriptor for the script"},
                 {RPCResult::Type::STR, "type", "The output type (e.g. " + GetAllOutputTypes() + ")"},
                 {RPCResult::Type::STR, "address", /* optional */ true, "The Dash address (only if a well-defined address exists)"},
             },
diff --git a/test/functional/data/rpc_decodescript.json b/test/functional/data/rpc_decodescript.json
@@ -4,6 +4,7 @@
         {
             "asm": "OP_HASH160 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee OP_EQUAL",
             "address": "92Cpm6g9Hba4maFG66aDjVxcgPY4wnQM4E",
+            "desc": "addr(92Cpm6g9Hba4maFG66aDjVxcgPY4wnQM4E)#w082pp4j",
             "type": "scripthash"
         }
     ],
@@ -12,7 +13,8 @@
         {
             "asm": "OP_RETURN 0",
             "type": "nulldata",
-            "p2sh": "93JSZ4DRLAifokPwn3C6WtnZoAVHwDa6UP"
+            "p2sh": "93JSZ4DRLAifokPwn3C6WtnZoAVHwDa6UP",
+            "desc": "raw(6a00)#ncfmkl43"
         }
     ]
 ]
diff --git a/test/util/data/tt-delin1-out.json b/test/util/data/tt-delin1-out.json
@@ -193,6 +193,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs)#faud38f0",
                 "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
                 "address": "XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs",
                 "type": "pubkeyhash"
@@ -204,6 +205,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XkaMatRZjFxq1QbgUvdmqGzGRaPqSLvvS6)#kvxym3t8",
                 "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
                 "address": "XkaMatRZjFxq1QbgUvdmqGzGRaPqSLvvS6",
                 "type": "pubkeyhash"
diff --git a/test/util/data/tt-delout1-out.json b/test/util/data/tt-delout1-out.json
@@ -202,6 +202,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs)#faud38f0",
                 "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
                 "address": "XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs",
                 "type": "pubkeyhash"
diff --git a/test/util/data/tt-locktime317000-out.json b/test/util/data/tt-locktime317000-out.json
@@ -202,6 +202,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs)#faud38f0",
                 "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
                 "address": "XooH6vpTCuVowS9vmJowNaNGcJQ3cQT7rs",
                 "type": "pubkeyhash"
@@ -213,6 +214,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XkaMatRZjFxq1QbgUvdmqGzGRaPqSLvvS6)#kvxym3t8",
                 "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
                 "address": "XkaMatRZjFxq1QbgUvdmqGzGRaPqSLvvS6",
                 "type": "pubkeyhash"
diff --git a/test/util/data/txcreate1.json b/test/util/data/txcreate1.json
@@ -40,6 +40,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw)#nr4se9ls",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "address": "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw",
                 "type": "pubkeyhash"
@@ -51,6 +52,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XxppMBDQ6SiJrKcBrAy4WkkNdrxDBfzFdZ)#ack2ftlg",
                 "hex": "76a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac",
                 "address": "XxppMBDQ6SiJrKcBrAy4WkkNdrxDBfzFdZ",
                 "type": "pubkeyhash"
diff --git a/test/util/data/txcreate2.json b/test/util/data/txcreate2.json
@@ -13,6 +13,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "",
+                "desc": "raw()#58lrscpx",
                 "hex": "",
                 "type": "nonstandard"
             }
diff --git a/test/util/data/txcreatedata1.json b/test/util/data/txcreatedata1.json
@@ -22,6 +22,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw)#nr4se9ls",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "address": "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw",
                 "type": "pubkeyhash"
@@ -33,6 +34,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
+                "desc": "raw(6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e)#zf2avljj",
                 "hex": "6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
                 "type": "nulldata"
             }
diff --git a/test/util/data/txcreatedata2.json b/test/util/data/txcreatedata2.json
@@ -22,6 +22,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw)#nr4se9ls",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "address": "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw",
                 "type": "pubkeyhash"
@@ -33,6 +34,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
+                "desc": "raw(6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e)#zf2avljj",
                 "hex": "6a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",
                 "type": "nulldata"
             }
diff --git a/test/util/data/txcreatedata_seq0.json b/test/util/data/txcreatedata_seq0.json
@@ -22,6 +22,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw)#nr4se9ls",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "address": "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw",
                 "type": "pubkeyhash"
diff --git a/test/util/data/txcreatedata_seq1.json b/test/util/data/txcreatedata_seq1.json
@@ -31,6 +31,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw)#nr4se9ls",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "address": "Xdak8YsJz8tm1iHFmycfTyKeUvHgfbdpyw",
                 "type": "pubkeyhash"
diff --git a/test/util/data/txcreatemultisig1.json b/test/util/data/txcreatemultisig1.json
@@ -13,6 +13,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG",
+                "desc": "multi(2,02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397,021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d,02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485)#8s88p9pl",
                 "hex": "522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae",
                 "type": "multisig"
             }
diff --git a/test/util/data/txcreatemultisig2.json b/test/util/data/txcreatemultisig2.json
@@ -13,6 +13,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL",
+                "desc": "addr(7V11XGPxzBWxkiuw15a1Vgk7XT74tyYtCY)#2m9p8juh",
                 "hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87",
                 "address": "7V11XGPxzBWxkiuw15a1Vgk7XT74tyYtCY",
                 "type": "scripthash"
diff --git a/test/util/data/txcreateoutpubkey1.json b/test/util/data/txcreateoutpubkey1.json
@@ -13,6 +13,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG",
+                "desc": "pk(02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397)#rk5v7uqw",
                 "hex": "2102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac",
                 "type": "pubkey"
             }
diff --git a/test/util/data/txcreatescript1.json b/test/util/data/txcreatescript1.json
@@ -13,6 +13,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DROP",
+                "desc": "raw(75)#ppey0zqj",
                 "hex": "75",
                 "type": "nonstandard"
             }
diff --git a/test/util/data/txcreatescript2.json b/test/util/data/txcreatescript2.json
@@ -13,6 +13,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL",
+                "desc": "addr(7co3R3WSW8mHKMkFK2FrzQY2fLCBWsg56D)#tjdnllwj",
                 "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587",
                 "address": "7co3R3WSW8mHKMkFK2FrzQY2fLCBWsg56D",
                 "type": "scripthash"
diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json
@@ -22,6 +22,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk)#m8zt5egk",
                 "hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac",
                 "address": "XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk",
                 "type": "pubkeyhash"

Original file line number	Diff line number	Diff line change
`@@ -1250,6 +1250,7 @@ static RPCHelpMan gettxout()`
`1250`	`1250`	`{RPCResult::Type::OBJ, "scriptPubKey", "",`
`1251`	`1251`	`{`
`1252`	`1252`	`{RPCResult::Type::STR, "asm", ""},`
	`1253`	`+ {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},`
`1253`	`1254`	`{RPCResult::Type::STR_HEX, "hex", ""},`
`1254`	`1255`	`{RPCResult::Type::STR_HEX, "type", "The type, eg pubkeyhash"},`
`1255`	`1256`	`{RPCResult::Type::STR, "address", /* optional */ true, "Dash address (only if a well-defined address exists)"},`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`{`
`5`	`5`	`"asm": "OP_HASH160 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee OP_EQUAL",`
`6`	`6`	`"address": "92Cpm6g9Hba4maFG66aDjVxcgPY4wnQM4E",`
	`7`	`+ "desc": "addr(92Cpm6g9Hba4maFG66aDjVxcgPY4wnQM4E)#w082pp4j",`
`7`	`8`	`"type": "scripthash"`
`8`	`9`	`}`
`9`	`10`	`],`
`@@ -12,7 +13,8 @@`
`12`	`13`	`{`
`13`	`14`	`"asm": "OP_RETURN 0",`
`14`	`15`	`"type": "nulldata",`
`15`		`- "p2sh": "93JSZ4DRLAifokPwn3C6WtnZoAVHwDa6UP"`
	`16`	`+ "p2sh": "93JSZ4DRLAifokPwn3C6WtnZoAVHwDa6UP",`
	`17`	`+ "desc": "raw(6a00)#ncfmkl43"`
`16`	`18`	`}`
`17`	`19`	`]`
`18`	`20`	`]`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`"n": 0,`
`14`	`14`	`"scriptPubKey": {`
`15`	`15`	`"asm": "",`
	`16`	`+ "desc": "raw()#58lrscpx",`
`16`	`17`	`"hex": "",`
`17`	`18`	`"type": "nonstandard"`
`18`	`19`	`}`