PSET: handle missing/NULL issuance assets when blinding

jgriffiths · jgriffiths · commit 3be6e80f90b0 · 2022-08-09T09:36:02.000+12:00
diff --git a/src/blindpsbt.cpp b/src/blindpsbt.cpp
@@ -361,11 +361,13 @@ BlindingStatus BlindPSBT(PartiallySignedTransaction& psbt, std::map<uint32_t, st
             if (secp256k1_generator_generate(secp256k1_blind_context, &ephemeral_input_tags.back(), asset.GetAsset().begin()) != 1) {
                 return BlindingStatus::INVALID_ASSET;
             }
-        } else {
+        } else if (asset.IsCommitment()) {
             // Parse the asset commitment as a generator (because it is)
             if (secp256k1_generator_parse(secp256k1_blind_context, &ephemeral_input_tags.back(), asset.vchCommitment.data()) != 1) {
                 return BlindingStatus::INVALID_ASSET_COMMITMENT;
             }
+        } else {
+            return BlindingStatus::INVALID_ASSET; // Missing asset
         }
 
         fixed_input_tags.emplace_back();

Original file line number	Diff line number	Diff line change
`@@ -361,11 +361,13 @@ BlindingStatus BlindPSBT(PartiallySignedTransaction& psbt, std::map<uint32_t, st`
`361`	`361`	`if (secp256k1_generator_generate(secp256k1_blind_context, &ephemeral_input_tags.back(), asset.GetAsset().begin()) != 1) {`
`362`	`362`	`return BlindingStatus::INVALID_ASSET;`
`363`	`363`	`}`
`364`		`- } else {`
	`364`	`+ } else if (asset.IsCommitment()) {`
`365`	`365`	`// Parse the asset commitment as a generator (because it is)`
`366`	`366`	`if (secp256k1_generator_parse(secp256k1_blind_context, &ephemeral_input_tags.back(), asset.vchCommitment.data()) != 1) {`
`367`	`367`	`return BlindingStatus::INVALID_ASSET_COMMITMENT;`
`368`	`368`	`}`
	`369`	`+ } else {`
	`370`	`+ return BlindingStatus::INVALID_ASSET; // Missing asset`
`369`	`371`	`}`
`370`	`372`
`371`	`373`	`fixed_input_tags.emplace_back();`