add optional InternalPk to Beneficiary::WitnessVout

Author: zoedberg

Cargo.lock

@@ -728,7 +728,7 @@ impl Exec for RgbArgs {
                             .next()
                             .expect("no addresses left")
                             .addr;
-                        Beneficiary::WitnessVout(Pay2Vout::new(addr.payload))
+                        Beneficiary::WitnessVout(Pay2Vout::new(addr.payload), None)
                     }
                     (_, Some(outpoint)) => {
                         let seal = GraphSeal::new_random(outpoint.txid, outpoint.vout);

cli/src/command.rs

@@ -49,6 +49,8 @@ pub const PSBT_GLOBAL_RGB_TRANSITION: u64 = 0x01;
 /// Proprietary key subtype for storing information on which close method
 /// should be used.
 pub const PSBT_GLOBAL_RGB_CLOSE_METHOD: u64 = 0x02;
+/// Proprietary key subtype to signal that tapret host has been put on change.
+pub const PSBT_GLOBAL_RGB_TAP_HOST_CHANGE: u64 = 0x03;
 /// Proprietary key subtype for storing RGB state transition operation id which
 /// consumes this input.
 pub const PSBT_IN_RGB_CONSUMED_BY: u64 = 0x01;
@@ -99,6 +101,7 @@ pub trait ProprietaryKeyRgb {
             data: opid.to_vec().into(),
         }
     }
+
     /// Constructs [`PSBT_GLOBAL_RGB_CLOSE_METHOD`] proprietary key.
     fn rgb_close_method() -> PropKey {
         PropKey {
@@ -116,6 +119,15 @@ pub trait ProprietaryKeyRgb {
             data: contract_id.to_vec().into(),
         }
     }
+
+    /// Constructs [`PSBT_GLOBAL_RGB_TAP_HOST_CHANGE`] proprietary key.
+    fn rgb_tapret_host_on_change() -> PropKey {
+        PropKey {
+            identifier: PSBT_RGB_PREFIX.to_owned(),
+            subtype: PSBT_GLOBAL_RGB_TAP_HOST_CHANGE,
+            data: none!(),
+        }
+    }
 }
 
 impl ProprietaryKeyRgb for PropKey {}
@@ -193,8 +205,12 @@ pub trait RgbExt {
 
     fn rgb_close_method(&self) -> Result<Option<CloseMethod>, RgbPsbtError>;
 
+    fn rgb_tapret_host_on_change(&self) -> bool;
+
     fn set_rgb_close_method(&mut self, close_method: CloseMethod);
 
+    fn set_rgb_tapret_host_on_change(&mut self);
+
     fn push_rgb_transition(&mut self, transition: Transition) -> Result<bool, RgbPsbtError>;
 
     fn rgb_bundles(&self) -> Result<BTreeMap<ContractId, TransitionBundle>, RgbPsbtError> {
@@ -299,10 +315,18 @@ impl RgbExt for Psbt {
         Err(RgbPsbtError::InvalidCloseMethod)
     }
 
+    fn rgb_tapret_host_on_change(&self) -> bool {
+        self.has_proprietary(&PropKey::rgb_tapret_host_on_change())
+    }
+
     fn set_rgb_close_method(&mut self, close_method: CloseMethod) {
         let _ = self.push_proprietary(PropKey::rgb_close_method(), vec![close_method as u8]);
     }
 
+    fn set_rgb_tapret_host_on_change(&mut self) {
+        let _ = self.push_proprietary(PropKey::rgb_tapret_host_on_change(), vec![]);
+    }
+
     fn push_rgb_transition(&mut self, mut transition: Transition) -> Result<bool, RgbPsbtError> {
         let opid = transition.id();
 

psbt/src/rgb.rs

@@ -85,6 +85,9 @@ pub enum WalletError {
     #[display(doc_comments)]
     IncompleteContract(validation::Status),
 
+    /// cannot find the terminal to add the tapret tweak to.
+    NoTweakTerminal,
+
     /// resolver error: {0}
     #[display(doc_comments)]
     Resolver(String),
@@ -147,11 +150,6 @@ pub enum CompositionError {
     /// invoice requesting chain-network pair {0} but contract commits to a different one ({1})
     InvoiceBeneficiaryWrongChainNet(ChainNet, ChainNet),
 
-    /// one of the RGB assignments spent require presence of tapret output -
-    /// even this is not a taproot wallet. Unable to create a valid PSBT, manual
-    /// work is needed.
-    TapretRequired,
-
     /// non-fungible state is not yet supported by the invoices.
     Unsupported,
 
@@ -170,6 +168,9 @@ pub enum CompositionError {
     /// no outputs available to store state of type {0}
     NoExtraOrChange(AssignmentType),
 
+    /// cannot find an output where to put the tapret commitment.
+    NoOutputForTapretCommitment,
+
     /// the provided PSBT doesn't pay any sats to the RGB beneficiary address.
     NoBeneficiaryOutput,