complete accept and consign commands

cli/src/cmd.rs

@@ -26,6 +26,7 @@ use std::fs::File;
 use std::path::PathBuf;
 use std::str::FromStr;
 
+use amplify::ByteArray;
 use bpwallet::fs::FsTextStore;
 use bpwallet::psbt::TxParams;
 use bpwallet::{Network, Sats, Vout, Wpkh, XpubDerivable};
@@ -136,7 +137,13 @@ pub enum Cmd {
     Wallets,
 
     /// Create a new wallet
-    Create { name: String, descriptor: String },
+    Create {
+        /// Wallet name
+        name: String,
+
+        /// Extended pubkey descriptor
+        descriptor: String,
+    },
 
     /// Print out a contract state
     #[clap(alias = "s")]
@@ -186,6 +193,9 @@ pub enum Cmd {
     /// Create a consignment transferring part of a contract state to another peer
     #[clap(alias = "c")]
     Consign {
+        /// Contract to use for the consignment
+        contract: ContractId,
+
         /// List of tokens of authority which should serve as a contract terminals
         #[clap(short, long)]
         terminals: Vec<AuthToken>,
@@ -224,7 +234,6 @@ impl Args {
                 let wallet = TapretWallet::load(provider, true).expect("unable to load the wallet");
                 DirBarrow::with_tapret(self.seal, self.mound(), wallet)
             }
-            _ => panic!("unsupported wallet type"),
         };
         // TODO: Sync wallet if needed
         wallet.into()
@@ -263,11 +272,12 @@ impl Args {
             Cmd::Create { name, descriptor } => {
                 let provider = self.wallet_provider(Some(name));
                 let xpub = XpubDerivable::from_str(descriptor).expect("Invalid extended pubkey");
+                let noise = xpub.xpub().chain_code().to_byte_array();
                 match self.seal {
                     SealType::BitcoinOpret => {
                         OpretWallet::create(
                             provider,
-                            Opret::new_unfunded(Wpkh::from(xpub)),
+                            Opret::new_unfunded(Wpkh::from(xpub), noise),
                             self.network,
                             true,
                         )
@@ -276,7 +286,7 @@ impl Args {
                     SealType::BitcoinTapret => {
                         TapretWallet::create(
                             provider,
-                            Tapret::key_only_unfunded(xpub),
+                            Tapret::key_only_unfunded(xpub, noise),
                             self.network,
                             true,
                         )
@@ -338,8 +348,33 @@ impl Args {
                 }
             }
 
-            Cmd::Consign { .. } => todo!(),
-            Cmd::Accept { .. } => todo!(),
+            Cmd::Consign {
+                contract,
+                terminals,
+                output,
+            } => {
+                let mut mound = self.mound();
+                match self.seal {
+                    SealType::BitcoinOpret => {
+                        mound.bc_opret.consign_to_file(*contract, terminals, output)
+                    }
+                    SealType::BitcoinTapret => mound
+                        .bc_tapret
+                        .consign_to_file(*contract, terminals, output),
+                    _ => panic!("unsupported wallet type"),
+                }
+                .expect("unable to consign contract");
+            }
+
+            Cmd::Accept { input } => {
+                let mut mound = self.mound();
+                match self.seal {
+                    SealType::BitcoinOpret => mound.bc_opret.accept_from_file(input),
+                    SealType::BitcoinTapret => mound.bc_opret.accept_from_file(input),
+                    _ => panic!("unsupported wallet type"),
+                }
+                .expect("unable to accept a consignment");
+            }
 
             _ => todo!(),
         }

examples/token.rs

@@ -23,13 +23,11 @@
 
 #[macro_use]
 extern crate amplify;
-#[macro_use]
-extern crate strict_types;
 
 use hypersonic::Schema;
-use rgb::bitcoin::file::OmniBarrow;
 
 fn main() {
+    /*
     let mut alice = OmniBarrow::load("");
 
     let seal1 = alice.next_seal_pub();
@@ -87,4 +85,6 @@ fn main() {
 
     // Locker, token (stash) and trace are append-only logs
     // Only state, wallet (alice) must persist in memory
+     */
+    todo!()
 }

src/descriptor.rs

@@ -27,7 +27,7 @@ use core::fmt::{self, Display, Formatter};
 use std::collections::HashMap;
 use std::ops::{Deref, DerefMut};
 
-use amplify::{Wrapper, WrapperMut};
+use amplify::{Bytes32, Wrapper, WrapperMut};
 use bpstd::dbc::opret::OpretProof;
 use bpstd::dbc::tapret::{TapretCommitment, TapretProof};
 use bpstd::seals::TxoSeal;
@@ -101,13 +101,15 @@ impl<D: dbc::Proof> Display for SealDescr<D> {
 pub struct Opret<K: DeriveSet = XpubDerivable> {
     pub descr: StdDescr<K>,
     pub seals: SealDescr<OpretProof>,
+    pub noise: Bytes32,
 }
 
 impl<K: DeriveSet> Opret<K> {
-    pub fn new_unfunded(descr: impl Into<StdDescr<K>>) -> Self {
+    pub fn new_unfunded(descr: impl Into<StdDescr<K>>, noise: impl Into<[u8; 32]>) -> Self {
         Self {
             descr: descr.into(),
             seals: empty!(),
+            noise: noise.into().into(),
         }
     }
 }
@@ -162,6 +164,7 @@ pub struct Tapret<K: DeriveXOnly = XpubDerivable> {
     pub tr: Tr<K>,
     pub tweaks: BTreeMap<Terminal, BTreeSet<TapretCommitment>>,
     pub seals: SealDescr<TapretProof>,
+    pub noise: Bytes32,
 }
 
 impl<K: DeriveXOnly> Display for Tapret<K> {
@@ -196,11 +199,12 @@ impl<K: DeriveXOnly> Display for Tapret<K> {
 }
 
 impl<K: DeriveXOnly> Tapret<K> {
-    pub fn key_only_unfunded(internal_key: K) -> Self {
+    pub fn key_only_unfunded(internal_key: K, noise: impl Into<[u8; 32]>) -> Self {
         Self {
             tr: Tr::KeyOnly(TrKey::from(internal_key)),
             tweaks: empty!(),
             seals: empty!(),
+            noise: noise.into().into(),
         }
     }
 

src/wallet.rs

@@ -22,6 +22,7 @@
 // or implied. See the License for the specific language governing permissions and limitations under
 // the License.
 
+use amplify::Bytes32;
 use bpstd::seals::Noise;
 use bpstd::{Network, XpubDerivable};
 use bpwallet::{Layer2Empty, NoLayer2, Wallet, WalletCache, WalletData, WalletDescr};
@@ -36,7 +37,9 @@ use crate::descriptor::{Opret, Tapret};
 #[wrapper_mut(DerefMut)]
 pub struct OpretWallet(Wallet<XpubDerivable, Opret<XpubDerivable>, NoLayer2>);
 
-impl WalletProvider for OpretWallet {}
+impl WalletProvider for OpretWallet {
+    fn noise_seed(&self) -> Bytes32 { self.noise }
+}
 impl OpretProvider for OpretWallet {}
 
 impl OpretWallet {
@@ -75,7 +78,9 @@ impl OpretWallet {
 #[wrapper_mut(DerefMut)]
 pub struct TapretWallet(Wallet<XpubDerivable, Tapret<XpubDerivable>, NoLayer2>);
 
-impl WalletProvider for TapretWallet {}
+impl WalletProvider for TapretWallet {
+    fn noise_seed(&self) -> Bytes32 { self.noise }
+}
 impl TapretProvider for TapretWallet {}
 
 impl TapretWallet {