Merge pull request #1182 from jgriffiths/fix_blind_reissuance_amount_…

…proof_output rpc: decodepsbt: fix check for blind_reissuance_amount_proof output
ElementsProject · Oct 18, 2022 · 816585d · 816585d
2 parents fde2277 + e2348da
commit 816585d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/blindpsbt.cpp b/src/blindpsbt.cpp
@@ -175,6 +175,10 @@ static bool CreateBlindAssetProof(std::vector<unsigned char>& assetproof, const
 
 bool VerifyBlindValueProof(CAmount value, const CConfidentialValue& conf_value, const std::vector<unsigned char>& proof, const CConfidentialAsset& conf_asset)
 {
+    if (conf_value.IsNull() || conf_asset.IsNull()) {
+        return false;
+    }
+
     secp256k1_pedersen_commitment value_commit;
     if (secp256k1_pedersen_commitment_parse(secp256k1_blind_context, &value_commit, conf_value.vchCommitment.data()) == 0) {
         return false;

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -1530,7 +1530,7 @@ static RPCHelpMan decodepsbt()
         }
 
         // Issuance blind inflation keys value proof
-        if (!input.m_blind_issuance_value_proof.empty()) {
+        if (!input.m_blind_issuance_inflation_keys_proof.empty()) {
             in.pushKV("blind_reissuance_amount_proof", HexStr(input.m_blind_issuance_inflation_keys_proof));
         }