Merge pull request #139 from RGB-WG/v0.11

Improve deterministic contract creation. Add convenient RGB20 contract builder

Cargo.toml

@@ -93,5 +93,9 @@ wasm-bindgen-test = "0.3"
 features = [ "all" ]
 
 [patch.crates-io]
+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" }
 rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.11" }

invoice/src/amount.rs

@@ -137,6 +137,26 @@ impl Amount {
     pub fn saturating_sub_assign(&mut self, other: impl Into<Self>) {
         *self = self.0.saturating_sub(other.into().0).into();
     }
+
+    #[must_use]
+    pub fn checked_add(&self, other: impl Into<Self>) -> Option<Self> {
+        self.0.checked_add(other.into().0).map(Self)
+    }
+    #[must_use]
+    pub fn checked_sub(&self, other: impl Into<Self>) -> Option<Self> {
+        self.0.checked_sub(other.into().0).map(Self)
+    }
+
+    #[must_use]
+    pub fn checked_add_assign(&mut self, other: impl Into<Self>) -> Option<()> {
+        *self = self.0.checked_add(other.into().0).map(Self)?;
+        Some(())
+    }
+    #[must_use]
+    pub fn checked_sub_assign(&mut self, other: impl Into<Self>) -> Option<()> {
+        *self = self.0.checked_sub(other.into().0).map(Self)?;
+        Some(())
+    }
 }
 
 impl Sum<u64> for Amount {

invoice/src/parse.rs

@@ -367,7 +367,7 @@ impl FromStr for RgbInvoice {
         let beneficiary = XChainNet::<Beneficiary>::from_str(beneficiary_str)?;
         let mut query_params = map_query_params(&uri)?;
 
-        let transports = if let Some(endpoints) = query_params.remove(ENDPOINTS) {
+        let transports = if let Some(endpoints) = query_params.shift_remove(ENDPOINTS) {
             let tokens = endpoints.split(TRANSPORT_SEP);
             let mut transport_vec: Vec<RgbTransport> = vec![];
             for token in tokens {
@@ -382,7 +382,7 @@ impl FromStr for RgbInvoice {
         };
 
         let mut expiry = None;
-        if let Some(exp) = query_params.remove(EXPIRY) {
+        if let Some(exp) = query_params.shift_remove(EXPIRY) {
             let timestamp = exp
                 .parse::<i64>()
                 .map_err(|e| InvoiceParseError::InvalidExpiration(e.to_string()))?;

src/containers/consignment.rs

@@ -31,7 +31,7 @@ use rgb::{
 };
 use strict_encoding::{StrictDeserialize, StrictDumb, StrictSerialize};
 
-use super::{ContainerVer, ContentId, ContentSigs, Terminal};
+use super::{Bindle, BindleContent, ContainerVer, ContentId, ContentSigs, Terminal};
 use crate::accessors::BundleExt;
 use crate::interface::{ContractSuppl, IfaceId, IfacePair};
 use crate::resolvers::ResolveHeight;
@@ -252,4 +252,10 @@ impl<const TYPE: bool> Consignment<TYPE> {
             signatures: self.signatures,
         }
     }
+
+    #[inline]
+    pub fn unsigned_bindle(self) -> Bindle<Self>
+    where Self: BindleContent {
+        Bindle::new(self)
+    }
 }

src/containers/seal.rs

@@ -25,7 +25,7 @@ use bp::seals::txout::{BlindSeal, CloseMethod, SealTxid};
 use bp::secp256k1::rand::{thread_rng, RngCore};
 use bp::Vout;
 use commit_verify::Conceal;
-use rgb::{GraphSeal, SecretSeal, TxoSeal, XChain};
+use rgb::{GraphSeal, Layer1, SecretSeal, TxoSeal, XChain};
 
 use crate::LIB_NAME_RGB_STD;
 
@@ -175,3 +175,12 @@ pub enum BuilderSeal<Seal: TxoSeal + Ord> {
 impl<Id: SealTxid> From<XChain<BlindSeal<Id>>> for BuilderSeal<BlindSeal<Id>> {
     fn from(seal: XChain<BlindSeal<Id>>) -> Self { BuilderSeal::Revealed(seal) }
 }
+
+impl<Seal: TxoSeal + Ord> BuilderSeal<Seal> {
+    pub fn layer1(&self) -> Layer1 {
+        match self {
+            BuilderSeal::Revealed(x) => x.layer1(),
+            BuilderSeal::Concealed(x) => x.layer1(),
+        }
+    }
+}