Merge pull request #88 from RGB-WG/develop

Modifications to containers: witness tx in consignments and type libs in ifaces

std/src/containers/bindle.rs

@@ -33,7 +33,7 @@ pub use _fs::*;
 use amplify::confinement::{Confined, TinyVec, U24};
 use baid58::Baid58ParseError;
 use base64::Engine;
-use rgb::{ContractId, Schema, SchemaId, SchemaRoot};
+use rgb::{BundleId, ContractId, Schema, SchemaId, SchemaRoot};
 use strict_encoding::{
     StrictDecode, StrictDeserialize, StrictDumb, StrictEncode, StrictSerialize, StrictType,
 };
@@ -81,8 +81,8 @@ impl BindleContent for Contract {
         bmap! {
             "Version" => self.version.to_string(),
             "Terminals" => self.terminals
-                .iter()
-                .map(|t| t.seal.to_string())
+                .keys()
+                .map(BundleId::to_string)
                 .collect::<Vec<_>>()
                 .join(",\n  "),
         }
@@ -99,8 +99,8 @@ impl BindleContent for Transfer {
             "Version" => self.version.to_string(),
             "ContractId" => self.contract_id().to_string(),
             "Terminals" => self.terminals
-                .iter()
-                .map(|t| t.seal.to_string())
+                .keys()
+                .map(BundleId::to_string)
                 .collect::<Vec<_>>()
                 .join(",\n  "),
         }

std/src/containers/consignment.rs

@@ -22,9 +22,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::{iter, slice};
 
-use amplify::confinement::{
-    LargeVec, MediumBlob, SmallOrdMap, SmallOrdSet, TinyOrdMap, TinyOrdSet,
-};
+use amplify::confinement::{LargeVec, MediumBlob, SmallOrdMap, TinyOrdMap, TinyOrdSet};
 use commit_verify::Conceal;
 use rgb::validation::{AnchoredBundle, ConsignmentApi};
 use rgb::{
@@ -93,7 +91,7 @@ pub struct Consignment<const TYPE: bool> {
     pub genesis: Genesis,
 
     /// Set of seals which are history terminals.
-    pub terminals: SmallOrdSet<Terminal>,
+    pub terminals: SmallOrdMap<BundleId, Terminal>,
 
     /// Data on all anchored state transitions contained in the consignments.
     pub bundles: LargeVec<AnchoredBundle>,
@@ -279,7 +277,12 @@ impl<const TYPE: bool> ConsignmentApi for Consignment<TYPE> {
     fn terminals(&self) -> BTreeSet<(BundleId, SecretSeal)> {
         self.terminals
             .iter()
-            .map(|terminal| (terminal.bundle_id, terminal.seal.conceal()))
+            .flat_map(|(bundle_id, terminal)| {
+                terminal
+                    .seals
+                    .iter()
+                    .map(|seal| (*bundle_id, seal.conceal()))
+            })
             .collect()
     }
 

std/src/containers/seal.rs

@@ -156,6 +156,13 @@ impl TerminalSeal {
     pub fn new_vout(method: CloseMethod, vout: impl Into<Vout>) -> TerminalSeal {
         TerminalSeal::WitnessVout(VoutSeal::new(method, vout))
     }
+
+    pub fn secret_seal(&self) -> Option<SecretSeal> {
+        match self {
+            TerminalSeal::ConcealedUtxo(seal) => Some(*seal),
+            TerminalSeal::WitnessVout(_) => None,
+        }
+    }
 }
 
 impl Conceal for TerminalSeal {

std/src/containers/transfer.rs

@@ -22,12 +22,13 @@
 use std::io;
 use std::str::FromStr;
 
+use amplify::confinement::SmallOrdSet;
 use amplify::{Bytes32, RawArray};
 use baid58::{Baid58ParseError, FromBaid58, ToBaid58};
 use commit_verify::{CommitEncode, CommitmentId, Conceal};
 use strict_encoding::{StrictEncode, StrictWriter};
 
-use crate::containers::Transfer;
+use crate::containers::{TerminalSeal, Transfer};
 use crate::LIB_NAME_RGB_STD;
 
 /// Transfer identifier.
@@ -64,9 +65,12 @@ impl CommitEncode for Transfer {
             let mut writer = StrictWriter::with(usize::MAX, e);
             writer = self.transfer.strict_encode(writer)?;
             writer = self.contract_id().strict_encode(writer)?;
-            for terminal in &self.terminals {
-                writer = terminal.seal.conceal().strict_encode(writer)?;
-                writer = terminal.bundle_id.strict_encode(writer)?;
+            for (bundle_id, terminal) in &self.terminals {
+                writer = bundle_id.strict_encode(writer)?;
+                let seals =
+                    SmallOrdSet::try_from_iter(terminal.seals.iter().map(TerminalSeal::conceal))
+                        .expect("same size iterator");
+                writer = seals.strict_encode(writer)?;
             }
             for attach_id in self.attachments.keys() {
                 writer = attach_id.strict_encode(writer)?;

std/src/containers/util.rs

@@ -19,12 +19,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use rgb::BundleId;
+use amplify::confinement::SmallOrdSet;
+use bp::Tx;
 
 use super::TerminalSeal;
 use crate::LIB_NAME_RGB_STD;
 
-#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_RGB_STD)]
 #[cfg_attr(
@@ -33,12 +34,23 @@ use crate::LIB_NAME_RGB_STD;
     serde(crate = "serde_crate", rename_all = "camelCase")
 )]
 pub struct Terminal {
-    pub bundle_id: BundleId,
-    pub seal: TerminalSeal,
+    pub seals: SmallOrdSet<TerminalSeal>,
+    pub tx: Option<Tx>,
 }
 
 impl Terminal {
-    pub fn with(bundle_id: BundleId, seal: TerminalSeal) -> Self { Terminal { bundle_id, seal } }
+    pub fn new(seal: TerminalSeal) -> Self {
+        Terminal {
+            seals: small_bset![seal],
+            tx: None,
+        }
+    }
+    pub fn with(seal: TerminalSeal, tx: Tx) -> Self {
+        Terminal {
+            seals: small_bset![seal],
+            tx: Some(tx),
+        }
+    }
 }
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display, Default)]