have raw transaction decoding infer output descriptors

Github-Pull: bitcoin#16795 Rebased-From: 9b94596
bitcoinknots · Sep 21, 2019 · 1402448 · 1402448
1 parent 37f236a
commit 1402448
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 0 deletions.
diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -7,6 +7,7 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <key_io.h>
+#include <script/descriptor.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <serialize.h>
@@ -158,6 +159,8 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey,
     int nRequired;
 
     out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
+    out.pushKV("desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
+
     if (fIncludeHex)
         out.pushKV("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end()));
 

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -120,6 +120,7 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
             "       \"n\" : n,                    (numeric) index\n"
             "       \"scriptPubKey\" : {          (json object)\n"
             "         \"asm\" : \"asm\",          (string) the asm\n"
+            "         \"desc\" : \"desc\",        (string) Inferred descriptor for the output\n"
             "         \"hex\" : \"hex\",          (string) the hex\n"
             "         \"reqSigs\" : n,            (numeric) The required sigs\n"
             "         \"type\" : \"pubkeyhash\",  (string) The type, eg 'pubkeyhash'\n"
@@ -572,6 +573,7 @@ static UniValue decoderawtransaction(const JSONRPCRequest& request)
             "       \"n\" : n,                    (numeric) index\n"
             "       \"scriptPubKey\" : {          (json object)\n"
             "         \"asm\" : \"asm\",          (string) the asm\n"
+            "         \"desc\" : \"desc\",        (string) Inferred descriptor for the output\n"
             "         \"hex\" : \"hex\",          (string) the hex\n"
             "         \"reqSigs\" : n,            (numeric) The required sigs\n"
             "         \"type\" : \"pubkeyhash\",  (string) The type, eg 'pubkeyhash'\n"

diff --git a/test/util/data/tt-delin1-out.json b/test/util/data/tt-delin1-out.json
@@ -194,6 +194,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o)#xvg87vgr",
                 "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",
@@ -207,6 +208,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb)#tsyprkms",
                 "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",

diff --git a/test/util/data/tt-delout1-out.json b/test/util/data/tt-delout1-out.json
@@ -203,6 +203,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o)#xvg87vgr",
                 "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",

diff --git a/test/util/data/tt-locktime317000-out.json b/test/util/data/tt-locktime317000-out.json
@@ -203,6 +203,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(1E7SGgAZFCHDnVZLuRViX3gUmxpMfdvd2o)#xvg87vgr",
                 "hex": "76a9148fd139bb39ced713f231c58a4d07bf6954d1c20188ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",
@@ -216,6 +217,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 6c772e9cf96371bba3da8cb733da70a2fcf20078 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(1AtWkdmfmYkErU16d3KYykJUbEp9MAj9Sb)#tsyprkms",
                 "hex": "76a9146c772e9cf96371bba3da8cb733da70a2fcf2007888ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",

diff --git a/test/util/data/txcreate1.json b/test/util/data/txcreate1.json
@@ -41,6 +41,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",
@@ -54,6 +55,7 @@
             "n": 1,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46)#vdmdu766",
                 "hex": "76a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",

diff --git a/test/util/data/txcreate2.json b/test/util/data/txcreate2.json
@@ -14,6 +14,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
@@ -23,6 +23,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",
@@ -36,6 +37,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
@@ -23,6 +23,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",
@@ -36,6 +37,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
@@ -23,6 +23,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",

diff --git a/test/util/data/txcreatedata_seq1.json b/test/util/data/txcreatedata_seq1.json
@@ -32,6 +32,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(13tuJJDR2RgArmgfv6JScSdreahzgc4T6o)#ztmwxg4c",
                 "hex": "76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",

diff --git a/test/util/data/txcreatemultisig1.json b/test/util/data/txcreatemultisig1.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG",
+                "desc": "multi(2,02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397,021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d,02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485)#8s88p9pl",
                 "hex": "522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae",
                 "reqSigs": 2,
                 "type": "multisig",

diff --git a/test/util/data/txcreatemultisig2.json b/test/util/data/txcreatemultisig2.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL",
+                "desc": "addr(34HNh57oBCRKkxNyjTuWAJkTbuGh6jg2Ms)#ngnz8933",
                 "hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87",
                 "reqSigs": 1,
                 "type": "scripthash",

diff --git a/test/util/data/txcreatemultisig3.json b/test/util/data/txcreatemultisig3.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "0 e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",
+                "desc": "addr(bc1qu9dgdg330r6r84g5mw7wqshg04exv2uttmw2elfwx74h5tgntuzs44gyfg)#yvt39j9m",
                 "hex": "0020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",
                 "reqSigs": 1,
                 "type": "witness_v0_scripthash",

diff --git a/test/util/data/txcreatemultisig4.json b/test/util/data/txcreatemultisig4.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 6edf12858999f0dae74f9c692e6694ee3621b2ac OP_EQUAL",
+                "desc": "addr(3BoFUz1StqcNcgUTZE5cC1eFhuYFzj3fGH)#466tx6fn",
                 "hex": "a9146edf12858999f0dae74f9c692e6694ee3621b2ac87",
                 "reqSigs": 1,
                 "type": "scripthash",

diff --git a/test/util/data/txcreatemultisig5.json b/test/util/data/txcreatemultisig5.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 a4051c02398868af83f28f083208fae99a769263 OP_EQUAL",
+                "desc": "addr(3GeGs1eHUxPz5YyuFe9WPpXid2UsUb5Jos)#juhnnegr",
                 "hex": "a914a4051c02398868af83f28f083208fae99a76926387",
                 "reqSigs": 1,
                 "type": "scripthash",

diff --git a/test/util/data/txcreateoutpubkey1.json b/test/util/data/txcreateoutpubkey1.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG",
+                "desc": "pk(02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397)#rk5v7uqw",
                 "hex": "2102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac",
                 "reqSigs": 1,
                 "type": "pubkey",

diff --git a/test/util/data/txcreateoutpubkey2.json b/test/util/data/txcreateoutpubkey2.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "0 a2516e770582864a6a56ed21a102044e388c62e3",
+                "desc": "addr(bc1q5fgkuac9s2ry56jka5s6zqsyfcugcchry5cwu0)#gm7zhxq2",
                 "hex": "0014a2516e770582864a6a56ed21a102044e388c62e3",
                 "reqSigs": 1,
                 "type": "witness_v0_keyhash",

diff --git a/test/util/data/txcreateoutpubkey3.json b/test/util/data/txcreateoutpubkey3.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 a5ab14c9804d0d8bf02f1aea4e82780733ad0a83 OP_EQUAL",
+                "desc": "addr(3GnzN8FqgvYGYdhj8NW6UNxxVv3Uj1ApQn)#zsln680u",
                 "hex": "a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a8387",
                 "reqSigs": 1,
                 "type": "scripthash",

diff --git a/test/util/data/txcreatescript1.json b/test/util/data/txcreatescript1.json
@@ -14,6 +14,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
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL",
+                "desc": "addr(3C5QarEGh9feKbDJ3QbMf2YNjnMoiPDhNp)#5mx9waq3",
                 "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587",
                 "reqSigs": 1,
                 "type": "scripthash",

diff --git a/test/util/data/txcreatescript3.json b/test/util/data/txcreatescript3.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "0 0bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",
+                "desc": "addr(bc1qp0lfxhnscvsu0j36l36uurgv5tuck4pzuqytkvwqp3kh78cupttqyf705v)#s4fdh9tu",
                 "hex": "00200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",
                 "reqSigs": 1,
                 "type": "witness_v0_scripthash",

diff --git a/test/util/data/txcreatescript4.json b/test/util/data/txcreatescript4.json
@@ -14,6 +14,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL",
+                "desc": "addr(3BNQbeFeJJGMAyDxPwWPuqxPMrjsFLjk3f)#fdleltnv",
                 "hex": "a9146a2c482f4985f57e702f325816c90e3723ca81ae87",
                 "reqSigs": 1,
                 "type": "scripthash",

diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json
@@ -23,6 +23,7 @@
             "n": 0,
             "scriptPubKey": {
                 "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",
+                "desc": "addr(193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7)#nw04wh58",
                 "hex": "76a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac",
                 "reqSigs": 1,
                 "type": "pubkeyhash",