bp: fix non-updated change vout after adding opret

RGB-WG · Feb 14, 2025 · 259bda8 · 259bda8
1 parent 073d0f0
commit 259bda8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/psbt/src/bp.rs b/psbt/src/bp.rs
@@ -33,7 +33,7 @@ impl RgbPsbt for Psbt {
     fn rgb_resolve(
         &mut self,
         script: PaymentScript,
-        mut change_vout: Option<Vout>,
+        change_vout: &mut Option<Vout>,
     ) -> Result<OpRequestSet<PrefabSeal>, RgbPsbtPrepareError> {
         match self.opret_hosts().count() {
             0 => {
@@ -51,7 +51,7 @@ impl RgbPsbt for Psbt {
         self.complete_construction();
 
         script
-            .resolve_seals(self.script_resolver(), change_vout)
+            .resolve_seals(self.script_resolver(), *change_vout)
             .map_err(|_| RgbPsbtPrepareError::ChangeRequired)
     }
 

diff --git a/psbt/src/common.rs b/psbt/src/common.rs
@@ -30,7 +30,7 @@ pub trait RgbPsbt {
     fn rgb_resolve(
         &mut self,
         script: PaymentScript,
-        change_vout: Option<Vout>,
+        change_vout: &mut Option<Vout>,
     ) -> Result<OpRequestSet<PrefabSeal>, RgbPsbtPrepareError>;
 
     fn rgb_fill_csv(&mut self, bundle: &PrefabBundle) -> Result<(), RgbPsbtCsvError>;

diff --git a/src/runtime.rs b/src/runtime.rs
@@ -124,10 +124,10 @@ impl<S: Supply, P: Pile<SealDef = WTxoSeal, SealSrc = TxoSeal>, X: Excavate<S, P
         script: PaymentScript,
         params: TxParams,
     ) -> Result<(Psbt, PrefabBundle), TransferError> {
-        let (mut psbt, meta) = self.0.wallet.compose_psbt(&script, params)?;
+        let (mut psbt, mut meta) = self.0.wallet.compose_psbt(&script, params)?;
 
         // From this moment transaction becomes unmodifiable
-        let request = psbt.rgb_resolve(script, meta.change_vout)?;
+        let request = psbt.rgb_resolve(script, &mut meta.change_vout)?;
         let bundle = self.bundle(request, meta.change_vout)?;
 
         psbt.rgb_fill_csv(&bundle)?;