Merge 426679e into merged_master (Elements PR ElementsProject#1134)

gwillen · gwillen · commit 98e863fcbb0e · 2023-03-01T09:18:11.000-08:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3464,7 +3464,7 @@ void CWalletTx::GetBlindingData(const unsigned int map_index, const std::vector<
         memcpy(asset_tag.begin(), &*(it + 73), 32);
         pubkey.Set(it + 105, it + 138);
 
-        if (conf_value.IsExplicit()) {
+        if (amount != -1 && conf_value.IsExplicit()) {
             assert(conf_value.GetAmount() == amount);
         }
     } else {

Original file line number	Diff line number	Diff line change
`@@ -3464,7 +3464,7 @@ void CWalletTx::GetBlindingData(const unsigned int map_index, const std::vector<`
`3464`	`3464`	`memcpy(asset_tag.begin(), &*(it + 73), 32);`
`3465`	`3465`	`pubkey.Set(it + 105, it + 138);`
`3466`	`3466`
`3467`		`- if (conf_value.IsExplicit()) {`
	`3467`	`+ if (amount != -1 && conf_value.IsExplicit()) {`
`3468`	`3468`	`assert(conf_value.GetAmount() == amount);`
`3469`	`3469`	`}`
`3470`	`3470`	`} else {`