Merge pull request #51 from zoedberg/v0.11_fixes

Experimental changes from Bitfinex team into an experimental branch. nACK from me, but they want to experiment and requested a `v0.11.1-alpha.1`, which will not be recommended for any use at least until I will do a full review of the stuff in it.

Author: dr-orlovsky

Cargo.lock

@@ -24,9 +24,9 @@ amplify = "4.7.0"
 strict_encoding = "~2.7.0"
 strict_types = "~2.7.2"
 aluvm = "0.11.0-beta.9"
-bp-core = "0.11.0-beta.9"
-rgb-std = { version = "0.11.0-beta.9", features = ["serde", "fs"] }
-rgb-interfaces = "0.11.0-beta.9"
+bp-core = "0.11.1-alpha.1"
+rgb-std = { version = "0.11.1-alpha.1", features = ["serde", "fs"] }
+rgb-interfaces = "0.11.1-alpha.1"
 chrono = "0.4.38"
 serde = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -1,12 +1,10 @@
 use amplify::hex::FromHex;
-use bp::dbc::Method;
 use bp::{Outpoint, Txid};
 use ifaces::Rgb20;
 use rgbstd::containers::{ConsignmentExt, FileContent};
 use rgbstd::interface::{FilterIncludeAll, FungibleAllocation};
 use rgbstd::invoice::Precision;
 use rgbstd::persistence::Stock;
-use rgbstd::XWitnessId;
 use schemata::dumb::NoResolver;
 use schemata::NonInflatableAsset;
 
@@ -17,7 +15,7 @@ fn main() {
     let beneficiary = Outpoint::new(beneficiary_txid, 1);
 
     #[allow(clippy::inconsistent_digit_grouping)]
-    let contract = NonInflatableAsset::testnet("ssi:anonymous","TEST", "Test asset", None, Precision::CentiMicro, [(Method::TapretFirst, beneficiary, 1_000_000_000_00u64)])
+    let contract = NonInflatableAsset::testnet("ssi:anonymous","TEST", "Test asset", None, Precision::CentiMicro, [(beneficiary, 1_000_000_000_00u64)])
         .expect("invalid contract data");
 
     let contract_id = contract.contract_id();
@@ -37,7 +35,7 @@ fn main() {
     eprintln!("{}", serde_json::to_string(&contract.spec()).unwrap());
 
     for FungibleAllocation  { seal, state, witness, .. } in allocations {
-        let witness = witness.as_ref().map(XWitnessId::to_string).unwrap_or("~".to_owned());
+        let witness = witness.as_ref().map(Txid::to_string).unwrap_or("~".to_owned());
         eprintln!("amount={state}, owner={seal}, witness={witness}");
     }
     eprintln!("totalSupply={}", contract.total_supply());

examples/rgb20.rs

@@ -10,7 +10,7 @@ use rgbstd::containers::{ConsignmentExt, FileContent, Kit};
 use rgbstd::invoice::Precision;
 use rgbstd::persistence::Stock;
 use rgbstd::stl::{AssetSpec, Attachment, ContractTerms, MediaType, RicardianContract};
-use rgbstd::{Allocation, GenesisSeal, TokenIndex, XChain};
+use rgbstd::{Allocation, ChainNet, GenesisSeal, TokenIndex};
 use schemata::dumb::NoResolver;
 use schemata::UniqueDigitalAsset;
 use sha2::{Digest, Sha256};
@@ -20,7 +20,7 @@ fn main() {
     let spec = AssetSpec::new("TEST", "Test uda", Precision::Indivisible);
     let beneficiary_txid =
         Txid::from_hex("14295d5bb1a191cdb6286dc0944df938421e3dfcbf0811353ccac4100c2068c5").unwrap();
-    let beneficiary = XChain::Bitcoin(GenesisSeal::tapret_first_rand(beneficiary_txid, 1));
+    let beneficiary = GenesisSeal::new_random(beneficiary_txid, 1);
 
     let index = TokenIndex::from_inner(2);
 
@@ -48,9 +48,11 @@ fn main() {
     let mut stock = Stock::in_memory();
     stock.import_kit(kit).expect("invalid issuer kit");
 
-    let contract = stock.contract_builder("ssi:anonymous",
+    let contract = stock.contract_builder(
+        "ssi:anonymous",
         UniqueDigitalAsset::schema().schema_id(),
         "RGB21Unique",
+        ChainNet::BitcoinTestnet4,
         ).expect("schema fails to implement RGB21 interface")
 
         .add_global_state("tokens", token_data)

examples/rgb21.rs

@@ -1,12 +1,10 @@
 use amplify::hex::FromHex;
-use bp::dbc::Method;
 use bp::{Outpoint, Txid};
 use ifaces::{Rgb25, Rgb25Wrapper};
 use rgbstd::containers::{ConsignmentExt, FileContent, Kit};
 use rgbstd::interface::{FilterIncludeAll, FungibleAllocation};
 use rgbstd::invoice::Precision;
 use rgbstd::persistence::{MemContract, Stock};
-use rgbstd::XWitnessId;
 use schemata::dumb::NoResolver;
 use schemata::CollectibleFungibleAsset;
 
@@ -25,7 +23,7 @@ fn main() {
     #[allow(clippy::inconsistent_digit_grouping)]
     let contract = Rgb25Wrapper::<MemContract>::testnet::<CollectibleFungibleAsset>("ssi:anonymous", "Test asset", Precision::CentiMicro)
         .expect("invalid contract data")
-        .allocate(Method::TapretFirst, beneficiary, 1_000_000_000_00u64.into())
+        .allocate(beneficiary, 1_000_000_000_00u64.into())
         .expect("invalid allocations")
         .issue_contract()
         .expect("invalid contract data");
@@ -45,7 +43,7 @@ fn main() {
     eprintln!("{}", contract.name());
 
     for FungibleAllocation  { seal, state, witness, .. } in allocations {
-        let witness = witness.as_ref().map(XWitnessId::to_string).unwrap_or("~".to_owned());
+        let witness = witness.as_ref().map(Txid::to_string).unwrap_or("~".to_owned());
         eprintln!("amount={state}, owner={seal}, witness={witness}");
     }
     eprintln!("totalSupply={}", contract.total_issued_supply());

examples/rgb25.rs

@@ -52,21 +52,23 @@ pub const ERRNO_ISSUED_MISMATCH: u8 = 1;
 pub const ERRNO_NON_FRACTIONAL: u8 = 10;
 
 pub mod dumb {
+    use bp::Tx;
     use rgbstd::validation::{ResolveWitness, WitnessResolverError};
-    use rgbstd::vm::{WitnessOrd, XWitnessTx};
-    use rgbstd::XWitnessId;
+    use rgbstd::vm::WitnessOrd;
+    use rgbstd::{ChainNet, Txid};
 
     pub struct NoResolver;
 
     impl ResolveWitness for NoResolver {
-        fn resolve_pub_witness(&self, _: XWitnessId) -> Result<XWitnessTx, WitnessResolverError> {
+        fn resolve_pub_witness(&self, _: Txid) -> Result<Tx, WitnessResolverError> {
             unreachable!()
         }
 
-        fn resolve_pub_witness_ord(
-            &self,
-            _: XWitnessId,
-        ) -> Result<WitnessOrd, WitnessResolverError> {
+        fn resolve_pub_witness_ord(&self, _: Txid) -> Result<WitnessOrd, WitnessResolverError> {
+            unreachable!()
+        }
+
+        fn check_chain_net(&self, _: ChainNet) -> Result<(), WitnessResolverError> {
             unreachable!()
         }
     }