Merge pull request #202 from RGB-WG/invoice-pay2vout

Use new Pay2Vout standard library feature
RGB-WG · Jun 8, 2024 · 58972e6 · 58972e6
2 parents 76a2277 + 7717d24
commit 58972e6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -99,8 +99,6 @@ bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "master" }
 bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "master" }
 psbt = { git = "https://github.com/BP-WG/bp-std", branch = "master" }
 descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "master" }
-rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" }
-rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "invoice-pay2vout" }
+rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "invoice-pay2vout" }
 rgb-interfaces = { git = "https://github.com/RGB-WG/rgb-interfaces", branch = "master" }
-
-# invoice-pay2vout
diff --git a/cli/src/command.rs b/cli/src/command.rs
@@ -35,7 +35,7 @@ use rgb::containers::{
     Transfer, UniversalFile,
 };
 use rgb::interface::{AmountChange, FilterExclude, IfaceId};
-use rgb::invoice::{Beneficiary, RgbInvoice, RgbInvoiceBuilder, XChainNet};
+use rgb::invoice::{Beneficiary, Pay2Vout, RgbInvoice, RgbInvoiceBuilder, XChainNet};
 use rgb::persistence::StashReadProvider;
 use rgb::schema::SchemaId;
 use rgb::validation::Validity;
@@ -689,7 +689,10 @@ impl Exec for RgbArgs {
                             .next()
                             .expect("no addresses left")
                             .addr;
-                        Beneficiary::WitnessVout(addr.payload)
+                        Beneficiary::WitnessVout(Pay2Vout {
+                            address: addr.payload,
+                            method: wallet.wallet().seal_close_method(),
+                        })
                     }
                     (_, Some(outpoint)) => {
                         let seal = XChain::Bitcoin(GraphSeal::new_random(

diff --git a/src/pay.rs b/src/pay.rs
@@ -203,9 +203,9 @@ where Self::Descr: DescriptorRgb<K>
         };
         let beneficiaries = match invoice.beneficiary.into_inner() {
             Beneficiary::BlindedSeal(_) => vec![],
-            Beneficiary::WitnessVout(payload) => {
+            Beneficiary::WitnessVout(pay2vout) => {
                 vec![BpBeneficiary::new(
-                    Address::new(payload, invoice.address_network()),
+                    Address::new(pay2vout.address, invoice.address_network()),
                     params.min_amount,
                 )]
             }
@@ -220,8 +220,8 @@ where Self::Descr: DescriptorRgb<K>
             self.construct_psbt(prev_outpoints, &beneficiaries, params.tx)?;
 
         let beneficiary_script =
-            if let Beneficiary::WitnessVout(addr) = invoice.beneficiary.into_inner() {
-                Some(addr.script_pubkey())
+            if let Beneficiary::WitnessVout(pay2vout) = invoice.beneficiary.into_inner() {
+                Some(pay2vout.address.script_pubkey())
             } else {
                 None
             };
@@ -246,8 +246,8 @@ where Self::Descr: DescriptorRgb<K>
         }
 
         let beneficiary_vout = match invoice.beneficiary.into_inner() {
-            Beneficiary::WitnessVout(addr) => {
-                let s = addr.script_pubkey();
+            Beneficiary::WitnessVout(pay2vout) => {
+                let s = pay2vout.address.script_pubkey();
                 let vout = psbt
                     .outputs()
                     .find(|output| output.script == s)
@@ -297,16 +297,17 @@ where Self::Descr: DescriptorRgb<K>
 
         let witness_txid = psbt.txid();
         let (beneficiary1, beneficiary2) = match invoice.beneficiary.into_inner() {
-            Beneficiary::WitnessVout(addr) => {
-                let s = addr.script_pubkey();
+            Beneficiary::WitnessVout(pay2vout) => {
+                let s = pay2vout.address.script_pubkey();
                 let vout = psbt
                     .outputs()
                     .position(|output| output.script == s)
                     .ok_or(CompletionError::NoBeneficiaryOutput)?;
                 let vout = Vout::from_u32(vout as u32);
-                let method = self.descriptor().seal_close_method();
-                let seal =
-                    XChain::Bitcoin(ExplicitSeal::new(method, Outpoint::new(witness_txid, vout)));
+                let seal = XChain::Bitcoin(ExplicitSeal::new(
+                    pay2vout.method,
+                    Outpoint::new(witness_txid, vout),
+                ));
                 (vec![], vec![seal])
             }
             Beneficiary::BlindedSeal(seal) => (vec![XChain::Bitcoin(seal)], vec![]),