v0.11 Beta 6 vs Beta5: sum of all changes

Cargo.toml

@@ -94,3 +94,18 @@ serde = ["serde_crate", "serde_with", "serde_yaml", "bp-std/serde", "bp-wallet/s
 
 [package.metadata.docs.rs]
 features = ["all"]
+
+[patch.crates-io]
+strict_types = { git = "https://github.com/strict-types/strict-types", branch = "master" }
+bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
+bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
+bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
+bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
+bp-invoice = { git = "https://github.com/BP-WG/bp-std", branch = "v0.11" }
+bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "v0.11" }
+psbt = { git = "https://github.com/BP-WG/bp-std", branch = "v0.11" }
+descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "v0.11" }
+bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "v0.11" }
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.11" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.11" }
+rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.11" }

cli/src/command.rs

@@ -43,7 +43,7 @@ use rgbstd::persistence::{Inventory, Stash};
 use rgbstd::schema::SchemaId;
 use rgbstd::validation::Validity;
 use rgbstd::vm::RgbIsa;
-use rgbstd::{AssetTag, AssignmentType, BundleId, OutputSeal, XChain, XOutputSeal};
+use rgbstd::{BundleId, OutputSeal, XChain, XOutputSeal};
 use seals::txout::CloseMethod;
 use serde_crate::{Deserialize, Serialize};
 use strict_types::encoding::{FieldName, TypeName};
@@ -784,7 +784,6 @@ impl Exec for RgbArgs {
                 pub struct ConsignmentInspection {
                     version: ContainerVer,
                     transfer: bool,
-                    asset_tags: TinyOrdMap<AssignmentType, AssetTag>,
                     terminals: SmallOrdMap<BundleId, Terminal>,
                     supplements: TinyOrdSet<ContractSuppl>,
                     signatures: TinyOrdMap<ContentId, ContentSigs>,
@@ -838,7 +837,6 @@ impl Exec for RgbArgs {
                     let contract = ConsignmentInspection {
                         version: contract.version,
                         transfer: contract.transfer,
-                        asset_tags: contract.asset_tags,
                         terminals: contract.terminals,
                         supplements: contract.supplements,
                         signatures: contract.signatures,
@@ -890,6 +888,7 @@ impl Exec for RgbArgs {
                 fs::create_dir_all(format!("{root_dir}/stash/ifaces"))?;
                 fs::create_dir_all(format!("{root_dir}/stash/geneses"))?;
                 fs::create_dir_all(format!("{root_dir}/stash/bundles"))?;
+                fs::create_dir_all(format!("{root_dir}/stash/witnesses"))?;
                 fs::create_dir_all(format!("{root_dir}/stash/anchors"))?;
                 fs::create_dir_all(format!("{root_dir}/stash/extensions"))?;
                 fs::create_dir_all(format!("{root_dir}/state"))?;
@@ -924,22 +923,21 @@ impl Exec for RgbArgs {
                             serde_yaml::to_string(suppl)?,
                         )?;
                     }
-                    let tags = runtime.contract_asset_tags(id)?;
-                    fs::write(
-                        format!("{root_dir}/stash/geneses/{id}.tags.yaml"),
-                        serde_yaml::to_string(tags)?,
-                    )?;
                 }
                 for id in runtime.bundle_ids()? {
                     fs::write(
                         format!("{root_dir}/stash/bundles/{id}.yaml"),
                         serde_yaml::to_string(runtime.bundle(id)?)?,
                     )?;
+                    fs::write(
+                        format!("{root_dir}/stash/witnesses/{id}.yaml"),
+                        serde_yaml::to_string(&runtime.bundled_witness(id)?.pub_witness)?,
+                    )?;
                 }
                 for id in runtime.witness_ids()? {
                     fs::write(
                         format!("{root_dir}/stash/anchors/{id}.yaml"),
-                        serde_yaml::to_string(runtime.anchor(id)?)?,
+                        serde_yaml::to_string(&runtime.anchors(id)?)?,
                     )?;
                 }
                 for id in runtime.extension_ids()? {
@@ -961,11 +959,15 @@ impl Exec for RgbArgs {
                 // Index
                 fs::write(
                     format!("{root_dir}/index/op-to-bundle.yaml"),
-                    serde_yaml::to_string(runtime.debug_bundle_op_index())?,
+                    serde_yaml::to_string(runtime.debug_op_bundle_index())?,
+                )?;
+                fs::write(
+                    format!("{root_dir}/index/bundle-to-contract.yaml"),
+                    serde_yaml::to_string(runtime.debug_bundle_contract_index())?,
                 )?;
                 fs::write(
-                    format!("{root_dir}/index/bundle-to-anchor.yaml"),
-                    serde_yaml::to_string(runtime.debug_anchor_bundle_index())?,
+                    format!("{root_dir}/index/bundle-to-witness.yaml"),
+                    serde_yaml::to_string(runtime.debug_bundle_witness_index())?,
                 )?;
                 fs::write(
                     format!("{root_dir}/index/contracts.yaml"),

psbt/src/lib.rs

@@ -26,10 +26,10 @@
 
 use bp::dbc::opret::OpretProof;
 use bp::dbc::tapret::TapretProof;
 pub use psbt::*;
 pub use rgb::*;
-use rgbstd::containers::{Batch, Fascia};
-use rgbstd::{AnchorSet, XAnchor, XChain};
+use rgbstd::containers::{AnchorSet, Batch, CloseMethodSet, Fascia};
+use rgbstd::{XChain, XWitnessId};
 
 pub use self::rgb::{
     ProprietaryKeyRgb, RgbExt, RgbInExt, RgbOutExt, RgbPsbtError, PSBT_GLOBAL_RGB_TRANSITION,
@@ -55,7 +55,7 @@
     Rgb(RgbPsbtError),
 
     #[from]
     Dbc(DbcPsbtError),
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Display, Error)]
@@ -71,7 +71,7 @@
     fn rgb_extract(&self) -> Result<Fascia, ExtractError>;
 }
 
 impl RgbPsbt for Psbt {
     fn rgb_embed(&mut self, batch: Batch) -> Result<(), EmbedError> {
         for info in batch {
             let contract_id = info.transition.contract_id;
@@ -85,7 +85,7 @@
             if !inputs.is_empty() {
                 return Err(EmbedError::AbsentInputs);
             }
-            self.push_rgb_transition(info.transition, info.methods)
+            self.push_rgb_transition(info.transition, info.method)
                 .expect("transitions are unique since they are in BTreeMap indexed by opid");
         }
         Ok(())
@@ -94,19 +94,30 @@
     fn rgb_commit(&mut self) -> Result<Fascia, CommitError> {
         // Convert RGB data to MPCs? Or should we do it at the moment we add them... No,
         // since we may require more DBC methods with each additional state transition
-        let (bundles, methods) = self.rgb_bundles_to_mpc()?;
+        let bundles = self.rgb_bundles_to_mpc()?;
         // DBC commitment for the required methods
+        let methods = bundles
+            .values()
+            .flat_map(|b| b.iter())
+            .map(|b| CloseMethodSet::from(b.close_method))
+            .reduce(|methods, method| methods | method)
+            .ok_or(RgbPsbtError::NoContracts)?;
         let (mut tapret_anchor, mut opret_anchor) = (None, None);
         if methods.has_tapret_first() {
             tapret_anchor = Some(self.dbc_commit::<TapretProof>()?);
         }
         if methods.has_opret_first() {
             opret_anchor = Some(self.dbc_commit::<OpretProof>()?);
         }
-        let anchor = AnchorSet::from_split(tapret_anchor, opret_anchor)
-            .expect("at least one of DBC are present due to CloseMethodSet type guarantees");
+        let anchor = match (tapret_anchor, opret_anchor) {
+            (None, None) => return Err(RgbPsbtError::NoContracts.into()),
+            (Some(tapret), None) => AnchorSet::Tapret(tapret),
+            (None, Some(opret)) => AnchorSet::Opret(opret),
+            (Some(tapret), Some(opret)) => AnchorSet::Double { tapret, opret },
+        };
         Ok(Fascia {
-            anchor: XAnchor::Bitcoin(anchor),
+            witness_id: XWitnessId::Bitcoin(self.txid()),
+            anchor,
             bundles,
         })
     }