Merge df4e99d into merged_master (Elements PR #1423)

Author: delta1

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);

src/wallet/spend.cpp

@@ -1573,6 +1573,8 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(
             return util::Error{error};
         }
         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);