release v0.11.0-beta.4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rgb-schemata"
-version = "0.11.0-beta.3"
+version = "0.11.0-beta.4"
 description = "Collection of the official RGB smart contract schemata"
 keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
 categories = ["cryptography::cryptocurrencies"]
@@ -14,10 +14,10 @@ readme = "README.md"
 
 [dependencies]
 amplify = "4.5.0"
-strict_encoding = "2.6.1"
+strict_encoding = "2.6.2"
 strict_types = "1.6.3"
 aluvm = "0.11.0-beta.2"
-bp-core = "0.11.0-beta.2"
+bp-core = "0.11.0-beta.3"
 rgb-std = { version = "0.11.0-beta.3", features = ["serde", "fs"] }
 serde = "1.0"
 serde_json = "1.0"

examples/rgb20.rs

@@ -2,23 +2,23 @@ use std::convert::Infallible;
 use std::fs;
 
 use amplify::hex::FromHex;
-use bp::{Outpoint, Tx, Txid};
+use bp::Txid;
 use rgb_schemata::{nia_rgb20, nia_schema};
 use rgbstd::containers::BindleContent;
 use rgbstd::interface::{rgb20, ContractBuilder, FilterIncludeAll, FungibleAllocation, Rgb20};
 use rgbstd::invoice::{Amount, Precision};
 use rgbstd::persistence::{Inventory, Stock};
 use rgbstd::resolvers::ResolveHeight;
 use rgbstd::stl::{ContractData, DivisibleAssetSpec, RicardianContract, Timestamp};
-use rgbstd::validation::{ResolveTx, TxResolverError};
-use rgbstd::{Layer1, WitnessAnchor, XAnchor};
+use rgbstd::validation::{ResolveWitness, WitnessResolverError};
+use rgbstd::{GenesisSeal, WitnessAnchor, WitnessId, XAnchor, XChain, XPubWitness};
 use strict_encoding::StrictDumb;
 
 struct DumbResolver;
 
-impl ResolveTx for DumbResolver {
-    fn resolve_bp_tx(&self, _: Layer1, _: Txid) -> Result<Tx, TxResolverError> {
-        Ok(Tx::strict_dumb())
+impl ResolveWitness for DumbResolver {
+    fn resolve_pub_witness(&self, _: WitnessId) -> Result<XPubWitness, WitnessResolverError> {
+        Ok(XPubWitness::strict_dumb())
     }
 }
 
@@ -38,10 +38,9 @@ fn main() {
         media: None,
     };
     let created = Timestamp::now();
-    let beneficiary = Outpoint::new(
-        Txid::from_hex("14295d5bb1a191cdb6286dc0944df938421e3dfcbf0811353ccac4100c2068c5").unwrap(),
-        1
-    );
+    let beneficiary_txid = 
+        Txid::from_hex("14295d5bb1a191cdb6286dc0944df938421e3dfcbf0811353ccac4100c2068c5").unwrap();
+    let beneficiary = XChain::Bitcoin(GenesisSeal::tapret_first_rand(beneficiary_txid, 1));
 
     const ISSUE: u64 = 1_000_000_000_00;
 

examples/rgb21.rs

@@ -4,7 +4,7 @@ use std::fs;
 use amplify::confinement::SmallBlob;
 use amplify::hex::FromHex;
 use amplify::Wrapper;
-use bp::{Outpoint, Tx, Txid};
+use bp::Txid;
 use rgb_schemata::{uda_rgb21, uda_schema};
 use rgbstd::containers::BindleContent;
 use rgbstd::interface::rgb21::{Allocation, EmbeddedMedia, OwnedFraction, TokenData, TokenIndex};
@@ -13,15 +13,15 @@ use rgbstd::invoice::Precision;
 use rgbstd::persistence::{Inventory, Stock};
 use rgbstd::resolvers::ResolveHeight;
 use rgbstd::stl::{self, DivisibleAssetSpec, RicardianContract, Timestamp};
-use rgbstd::validation::{ResolveTx, TxResolverError};
-use rgbstd::{Layer1, WitnessAnchor, XAnchor};
+use rgbstd::validation::{ResolveWitness, WitnessResolverError};
+use rgbstd::{GenesisSeal, WitnessAnchor, WitnessId, XAnchor, XChain, XPubWitness};
 use strict_encoding::StrictDumb;
 
 struct DumbResolver;
 
-impl ResolveTx for DumbResolver {
-    fn resolve_bp_tx(&self, _: Layer1, _: Txid) -> Result<Tx, TxResolverError> {
-        Ok(Tx::strict_dumb())
+impl ResolveWitness for DumbResolver {
+    fn resolve_pub_witness(&self, _: WitnessId) -> Result<XPubWitness, WitnessResolverError> {
+        Ok(XPubWitness::strict_dumb())
     }
 }
 
@@ -37,10 +37,9 @@ fn main() {
     let spec = DivisibleAssetSpec::new("TEST", "Test uda", Precision::Indivisible);
     let terms = RicardianContract::default();
     let created = Timestamp::now();
-    let beneficiary = Outpoint::new(
-        Txid::from_hex("623554ac1dcd15496c105a27042c438921f2a82873579be88e74d7ef559a3d91").unwrap(),
-        0
-    );
+    let beneficiary_txid =
+        Txid::from_hex("14295d5bb1a191cdb6286dc0944df938421e3dfcbf0811353ccac4100c2068c5").unwrap();
+    let beneficiary = XChain::Bitcoin(GenesisSeal::tapret_first_rand(beneficiary_txid, 1));
 
     let fraction = OwnedFraction::from_inner(1);
     let index = TokenIndex::from_inner(2);

examples/rgb25.rs

@@ -2,7 +2,7 @@ use std::convert::Infallible;
 use std::fs;
 
 use amplify::hex::FromHex;
-use bp::{Outpoint, Tx, Txid};
+use bp::Txid;
 use rgb_schemata::{cfa_rgb25, cfa_schema};
 use rgbstd::containers::BindleContent;
 use rgbstd::interface::{rgb25, ContractBuilder, FilterIncludeAll, FungibleAllocation};
@@ -12,16 +12,16 @@ use rgbstd::resolvers::ResolveHeight;
 use rgbstd::stl::{
     Attachment, ContractData, Details, MediaType, Name, RicardianContract, Timestamp,
 };
-use rgbstd::validation::{ResolveTx, TxResolverError};
-use rgbstd::{Layer1, WitnessAnchor, XAnchor};
+use rgbstd::validation::{ResolveWitness, WitnessResolverError};
+use rgbstd::{GenesisSeal, WitnessAnchor, WitnessId, XAnchor, XChain, XPubWitness};
 use sha2::{Digest, Sha256};
 use strict_encoding::StrictDumb;
 
 struct DumbResolver;
 
-impl ResolveTx for DumbResolver {
-    fn resolve_bp_tx(&self, _: Layer1, _: Txid) -> Result<Tx, TxResolverError> {
-        Ok(Tx::strict_dumb())
+impl ResolveWitness for DumbResolver {
+    fn resolve_pub_witness(&self, _: WitnessId) -> Result<XPubWitness, WitnessResolverError> {
+        Ok(XPubWitness::strict_dumb())
     }
 }
 
@@ -51,10 +51,9 @@ fn main() {
         media,
     };
     let created = Timestamp::now();
-    let beneficiary = Outpoint::new(
-        Txid::from_hex("623554ac1dcd15496c105a27042c438921f2a82873579be88e74d7ef559a3d91").unwrap(),
-        0
-    );
+    let beneficiary_txid =
+        Txid::from_hex("14295d5bb1a191cdb6286dc0944df938421e3dfcbf0811353ccac4100c2068c5").unwrap();
+    let beneficiary = XChain::Bitcoin(GenesisSeal::tapret_first_rand(beneficiary_txid, 1));
 
     const ISSUE: u64 = 1_000_000_000_000;