[RPC] Add nullifiers to listshieldedunspent output

random-zebra · random-zebra · commit e55a089bb707 · 2020-12-10T01:32:55.000+01:00
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -552,6 +552,7 @@ UniValue listshieldedunspent(const JSONRPCRequest& request)
                 "    \"amount\": xxxxx,          (numeric) the amount of value in the note\n"
                 "    \"memo\": xxxxx,            (string) hexademical string representation of memo field\n"
                 "    \"change\": true|false,     (boolean) true if the address that received the note is also one of the sending addresses\n"
+                "    \"nullifier\": xxxxx,       (string) the note's nullifier, hex encoded"
                 "  }\n"
                 "  ,...\n"
                 "]\n"
@@ -639,6 +640,10 @@ UniValue listshieldedunspent(const JSONRPCRequest& request)
             if (hasSaplingSpendingKey) {
                 obj.pushKV("change", pwalletMain->GetSaplingScriptPubKeyMan()->IsNoteSaplingChange(nullifierSet, entry.address, entry.op));
             }
+            const auto& nd = pwalletMain->mapWallet.at(entry.op.hash).mapSaplingNoteData.at(entry.op);
+            if (nd.nullifier) {
+                obj.pushKV("nullifier", nd.nullifier->ToString());
+            }
             results.push_back(obj);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -552,6 +552,7 @@ UniValue listshieldedunspent(const JSONRPCRequest& request)`
`552`	`552`	`" \"amount\": xxxxx, (numeric) the amount of value in the note\n"`
`553`	`553`	`" \"memo\": xxxxx, (string) hexademical string representation of memo field\n"`
`554`	`554`	`" \"change\": true\|false, (boolean) true if the address that received the note is also one of the sending addresses\n"`
	`555`	`+ " \"nullifier\": xxxxx, (string) the note's nullifier, hex encoded"`
`555`	`556`	`" }\n"`
`556`	`557`	`" ,...\n"`
`557`	`558`	`"]\n"`
`@@ -639,6 +640,10 @@ UniValue listshieldedunspent(const JSONRPCRequest& request)`
`639`	`640`	`if (hasSaplingSpendingKey) {`
`640`	`641`	`obj.pushKV("change", pwalletMain->GetSaplingScriptPubKeyMan()->IsNoteSaplingChange(nullifierSet, entry.address, entry.op));`
`641`	`642`	`}`
	`643`	`+ const auto& nd = pwalletMain->mapWallet.at(entry.op.hash).mapSaplingNoteData.at(entry.op);`
	`644`	`+ if (nd.nullifier) {`
	`645`	`+ obj.pushKV("nullifier", nd.nullifier->ToString());`
	`646`	`+ }`
`642`	`647`	`results.push_back(obj);`
`643`	`648`	`}`
`644`	`649`	`}`