Merge pull request #1423 from psgreco/master-win64-fixassert

delta1 · web-flow · commit df4e99dca3b9 · 2025-02-26T14:50:20.000+02:00
Fix Assert crash in win64 native builds
diff --git a/src/primitives/confidential.h b/src/primitives/confidential.h
@@ -149,7 +149,7 @@ class CConfidentialValue : public CConfidentialCommitment<9, 8, 9>
             return -1;
         }
 
-        assert(IsExplicit());;
+        assert(IsExplicit());
         return ReadBE64(&vchCommitment[1]);
     }
     void SetToAmount(CAmount nAmount);
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
@@ -1446,6 +1446,8 @@ static bool CreateTransactionInternal(
             return false;
         }
         txNew = tx_blinded; // sigh, `fillBlindDetails` may have modified txNew
+        // Update the change position to the new tx
+        change_position = txNew.vout.begin() + nChangePosInOut;
 
         int ret = BlindTransaction(blind_details->i_amount_blinds, blind_details->i_asset_blinds, blind_details->i_assets, blind_details->i_amounts, blind_details->o_amount_blinds, blind_details->o_asset_blinds, blind_details->o_pubkeys, issuance_asset_keys, issuance_token_keys, tx_blinded);
         assert(ret != -1);

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class CConfidentialValue : public CConfidentialCommitment<9, 8, 9>`
`149`	`149`	`return -1;`
`150`	`150`	`}`
`151`	`151`
`152`		`- assert(IsExplicit());;`
	`152`	`+ assert(IsExplicit());`
`153`	`153`	`return ReadBE64(&vchCommitment[1]);`
`154`	`154`	`}`
`155`	`155`	`void SetToAmount(CAmount nAmount);`
Original file line number	Diff line number	Diff line change
`@@ -1446,6 +1446,8 @@ static bool CreateTransactionInternal(`
`1446`	`1446`	`return false;`
`1447`	`1447`	`}`
`1448`	`1448`	txNew = tx_blinded; // sigh, `fillBlindDetails` may have modified txNew
	`1449`	`+ // Update the change position to the new tx`
	`1450`	`+ change_position = txNew.vout.begin() + nChangePosInOut;`
`1449`	`1451`
`1450`	`1452`	`int ret = BlindTransaction(blind_details->i_amount_blinds, blind_details->i_asset_blinds, blind_details->i_assets, blind_details->i_amounts, blind_details->o_amount_blinds, blind_details->o_asset_blinds, blind_details->o_pubkeys, issuance_asset_keys, issuance_token_keys, tx_blinded);`
`1451`	`1453`	`assert(ret != -1);`