Merge pull request #85 from RGB-WG/develop

Update to use latest consensus changes

.github/workflows/build.yml

@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        toolchain: [ nightly, beta, stable, 1.66.0 ]
+        toolchain: [ nightly, beta, stable, 1.67.0 ]
     steps:
       - uses: actions/checkout@v2
       - name: Install rust ${{ matrix.toolchain }}

Cargo.toml

@@ -12,18 +12,18 @@ default-members = [
 authors = ["Dr Maxim Orlovsky <[email protected]>"]
 homepage = "https://github.com/RGB-WG"
 repository = "https://github.com/RGB-WG/rgb-wallet"
-rust-version = "1.66" # Due to strict encoding library (caused by GAD)
+rust-version = "1.67" # Due to strict encoding library
 edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
 amplify = "4.0.0"
 baid58 = "0.3.1"
-strict_encoding = "2.4.1"
-strict_types = "1.4.1"
-commit_verify = { version = "0.10.3", features = ["stl"] }
-bp-core = { version = "0.10.4", features = ["stl"] }
-rgb-core = { version = "0.10.4", features = ["stl"] }
+strict_encoding = "2.5.0"
+strict_types = "1.5.0"
+commit_verify = { version = "0.10.4", features = ["stl"] }
+bp-core = { version = "0.10.5", features = ["stl"] }
+rgb-core = { version = "0.10.5", features = ["stl"] }
 
 [package]
 name = "rgb-wallet"
@@ -76,6 +76,3 @@ wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
 features = [ "all" ]
-
-[patch.crates-io]
-rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "preserve-historic-state" }

MANIFEST.yml

@@ -3,7 +3,7 @@ Type: Library
 Kind: Free software
 License: Apache-2.0
 Language: Rust
-Compiler: 1.66
+Compiler: 1.67
 Author: Maxim Orlovsky
 Maintained: LNP/BP Standards Association, Switzerland
 Maintainers:

src/psbt/dbc.rs

@@ -19,7 +19,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use amplify::num::u4;
+use amplify::num::u5;
 use amplify::RawArray;
 use bitcoin::hashes::Hash;
 use bitcoin::psbt::Psbt;
@@ -111,7 +111,7 @@ impl PsbtDbc for Psbt {
         let txout = &mut self.unsigned_tx.output[vout];
 
         let messages = output.lnpbp4_message_map()?;
-        let min_depth = u4::with(
+        let min_depth = u5::with(
             output
                 .lnpbp4_min_tree_depth()
                 .unwrap_or(PSBT_OUT_LNPBP4_MIN_TREE_DEPTH),

std/src/containers/consignment.rs

@@ -29,8 +29,8 @@ use commit_verify::Conceal;
 use rgb::validation::{AnchoredBundle, ConsignmentApi};
 use rgb::{
     validation, AttachId, BundleId, ContractHistory, ContractId, Extension, Genesis, GraphSeal,
-    OpId, OpRef, Operation, OrderedTxid, Schema, SchemaId, SecretSeal, SubSchema, Transition,
-    TransitionBundle,
+    OpId, OpRef, Operation, Schema, SchemaId, SecretSeal, SubSchema, Transition, TransitionBundle,
+    WitnessAnchor,
 };
 use strict_encoding::{StrictDeserialize, StrictDumb, StrictSerialize};
 
@@ -185,7 +185,7 @@ impl<const TYPE: bool> Consignment<TYPE> {
                 if let Some(transition) = &item.transition {
                     let txid = anchored_bundle.anchor.txid;
                     let height = resolver.resolve_height(txid)?;
-                    let ord_txid = OrderedTxid::new(height, txid);
+                    let ord_txid = WitnessAnchor::new(height, txid);
                     history.add_transition(transition, ord_txid);
                     for (id, used) in &mut extension_idx {
                         if *used {

std/src/interface/rgb21.rs

@@ -46,7 +46,7 @@ use crate::stl::{
 
 pub const LIB_NAME_RGB21: &str = "RGB21";
 /// Strict types id for the library providing data types for RGB21 interface.
-pub const LIB_ID_RGB21: &str = "hunter_powder_campus_3Vo1fsyUpBBaJXW7ACWKtXgTh7dEyCUgoM2CPcmjRYDk";
+pub const LIB_ID_RGB21: &str = "benny_horse_salad_E3AsDKsHSqAPQLvJke3DcPrkErbS2Jxf8pQ8jYBQYJPA";
 
 #[derive(
     Wrapper, WrapperMut, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Default, From

std/src/persistence/hoard.rs

@@ -26,7 +26,7 @@ use amplify::confinement;
 use amplify::confinement::{Confined, LargeOrdMap, SmallOrdMap, TinyOrdMap, TinyOrdSet};
 use bp::dbc::anchor::MergeError;
 use commit_verify::mpc;
-use commit_verify::mpc::{MerkleBlock, UnrelatedProof};
+use commit_verify::mpc::MerkleBlock;
 use rgb::{
     Anchor, AnchorId, AnchoredBundle, BundleId, ContractId, Extension, Genesis, OpId, Operation,
     SchemaId, TransitionBundle,
@@ -46,7 +46,7 @@ pub enum ConsumeError {
     Confinement(confinement::Error),
 
     #[from]
-    Anchor(UnrelatedProof),
+    Anchor(mpc::InvalidProof),
 
     #[from]
     Merge(MergeError),

std/src/persistence/inventory.rs

@@ -94,7 +94,7 @@ pub enum InventoryError<E: Error> {
     /// Must be reported to LNP/BP Standards Association.
     #[from]
     #[from(mpc::LeafNotKnown)]
-    #[from(mpc::UnrelatedProof)]
+    #[from(mpc::InvalidProof)]
     #[from(RevealError)]
     #[from(StashInconsistency)]
     InternalInconsistency(InventoryInconsistency),
@@ -227,7 +227,7 @@ pub enum InventoryInconsistency {
     /// It may happen due to RGB library bug, or indicate internal inventory
     /// inconsistency and compromised inventory data storage.
     #[from(mpc::LeafNotKnown)]
-    #[from(mpc::UnrelatedProof)]
+    #[from(mpc::InvalidProof)]
     UnrelatedAnchor,
 
     /// bundle reveal error. Details: {0}
@@ -297,11 +297,21 @@ pub trait Inventory: Deref<Target = Self::Stash> {
     where
         R::Error: 'static;
 
+    /// # Safety
+    ///
+    /// Assumes that the bundle belongs to a non-mined witness transaction. Must
+    /// be used only to consume locally-produced bundles before witness
+    /// transactions are mined.
     fn consume_anchor(
         &mut self,
         anchor: Anchor<mpc::MerkleBlock>,
     ) -> Result<(), InventoryError<Self::Error>>;
 
+    /// # Safety
+    ///
+    /// Assumes that the bundle belongs to a non-mined witness transaction. Must
+    /// be used only to consume locally-produced bundles before witness
+    /// transactions are mined.
     fn consume_bundle(
         &mut self,
         contract_id: ContractId,

std/src/persistence/stock.rs

@@ -32,8 +32,8 @@ use rgb::validation::{Status, Validity, Warning};
 use rgb::{
     validation, AnchorId, AnchoredBundle, Assign, AssignmentType, BundleId, ContractHistory,
     ContractId, ContractState, ExposedState, Extension, Genesis, GenesisSeal, GraphSeal, OpId,
-    Operation, Opout, OrderedTxid, SecretSeal, SubSchema, Transition, TransitionBundle, TxoSeal,
-    TypedAssigns,
+    Operation, Opout, SecretSeal, SubSchema, Transition, TransitionBundle, TxoSeal, TypedAssigns,
+    WitnessAnchor,
 };
 use strict_encoding::{StrictDeserialize, StrictSerialize};
 
@@ -518,7 +518,7 @@ impl Inventory for Stock {
             .ok_or(InventoryInconsistency::StateAbsent(contract_id))?;
         for item in bundle.values() {
             if let Some(transition) = &item.transition {
-                let ord_txid = OrderedTxid::new(0, witness_txid);
+                let ord_txid = WitnessAnchor::from_mempool(witness_txid);
                 history.add_transition(transition, ord_txid);
             }
         }

std/src/resolvers.rs

@@ -20,9 +20,10 @@
 // limitations under the License.
 
 use bp::Txid;
+use rgb::WitnessOrd;
 
 pub trait ResolveHeight {
     type Error: std::error::Error;
 
-    fn resolve_height(&mut self, txid: Txid) -> Result<u32, Self::Error>;
+    fn resolve_height(&mut self, txid: Txid) -> Result<WitnessOrd, Self::Error>;
 }

std/src/stl/stl.rs

@@ -38,11 +38,10 @@ use crate::LIB_NAME_RGB_STD;
 /// Strict types id for the library providing standard data types which may be
 /// used in RGB smart contracts.
 pub const LIB_ID_RGB_CONTRACT: &str =
-    "scoop_ocean_contour_DizxAzKBUaXCUkEZDGQegfJXQeK5Nk4pK142eEkC1EBM";
+    "price_canvas_oliver_9Te5P6nq3oaDHMgttLEbkojbeQPTqqZLhjxZ3my1F8aJ";
 
 /// Strict types id for the library representing of RGB StdLib data types.
-pub const LIB_ID_RGB_STD: &str =
-    "abraham_erosion_miranda_6QBNQY6imiWB5rRaLuZUeAsLQZtQS7wGbvrvGQCfuSff";
+pub const LIB_ID_RGB_STD: &str = "patent_iris_torch_Firwvn75qng8cm4n7iHXXiFDsG1V476vYGqdfwwFRT1b";
 
 fn _rgb_std_stl() -> Result<TypeLib, CompileError> {
     LibBuilder::new(libname!(LIB_NAME_RGB_STD), tiny_bset! {

stl/RGB21@0.1.0.sta

@@ -1,14 +1,14 @@
 -----BEGIN STRICT TYPE LIB-----
-Id: hunter_powder_campus_3Vo1fsyUpBBaJXW7ACWKtXgTh7dEyCUgoM2CPcmjRYDk
+Id: benny_horse_salad_E3AsDKsHSqAPQLvJke3DcPrkErbS2Jxf8pQ8jYBQYJPA
 Name: RGB21
 Dependencies: 
-  Std@siren_reward_number_C2hHN1Y5VwxxNrrLBBnuTQBgB19WN4HzKD8tZ2YFkeCr,
-  RGBContract@scoop_ocean_contour_DizxAzKBUaXCUkEZDGQegfJXQeK5Nk4pK142eEkC1EBM,
-  Bitcoin@extra_rapid_armada_EXDzvefCHMLgk4KXNvsXsDr2QzgPkxFFUCSEkL3S1ZJL
+  Bitcoin@race_ballet_golf_6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi,
+  Std@lagoon_rodent_option_9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ,
+  RGBContract@price_canvas_oliver_9Te5P6nq3oaDHMgttLEbkojbeQPTqqZLhjxZ3my1F8aJ
 
-BVJHQjIxA6PfryKu8fMyTcCapSrJrwB3X+sP8KzoIfK9PveLdRIbA1N0ZL0OlPv7
-Du3YP01TdZZ9Ogq4k/N+plErIMh06cVgoaN8C1JHQkNvbnRyYWN0yOYNT9QaenRZ
-ECvZs8UGgzvSjijtKe7LofnokA1ar30HQml0Y29pbgMHQml0Y29pbgMAIeM+Q8Wq
+BVJHQjIxA05OhPRwFsnl0mJ8v8P0NrLdbNTRubBEW/9e74J2cndXB0JpdGNvaW57
+hIA8nvriESWnfCw5vHDS/ej5Q64N/Zz05oLtx2bKcANTdGR9sISUTLPJ3fXoMwH6
+UBNNJmaG5lsPF0/is+di00NitwtSR0JDb250cmFjdAMHQml0Y29pbgMAIeM+Q8Wq
 XPIpJ1OjOMFn7TtjnE3Zzr2pjzRpF7rJQ3UEVm91dKOCQvPL19HQoRLajeFgL1bU
 +G8OxMR2xcBoWUxLBGVWBFR4aWToakDNXCX5veKE/2mlETKnQSshVb0OVhLBv+OE
 lWDFBghPdXRwb2ludAtSR0JDb250cmFjdAgADtIaOxmF+PVfGv/HJh1VH2urS/IG
@@ -22,11 +22,11 @@ lhIjkJZNIGSbJ7XnyHUUCkF0dGFjaG1lbnQDU3RkAgALbFANlCZEYvtxwOh0eAN2
 lbRkYVi57FGd1tR+dNxU8w5Bc2NpaVByaW50YWJsZWAVwOcHZKn0iucd1EjK9ANb
 /+vbYu/3Dch5Qob4kQ9BDEFscGhhQ2Fwc051bQoACkFsbG9jYXRpb24FAgFlAVZD
 5EiM8/cUNAF51yXoKPLAS/xBzDsn9gVP2jdzHQEZ6+adE3BI4VlvwefpUK8KZMF2
-XynkEiSrLSv052Bcdw5BdHRhY2htZW50TmFtZQUBAAgCo9+vIq7x8zJNwJqlKsmv
-AHdf6w/wrOgh8r0+94t1EhsLbFANlCZEYvtxwOh0eAN2lbRkYVi57FGd1tR+dNxU
+XynkEiSrLSv052Bcdw5BdHRhY2htZW50TmFtZQUBAAgCe4SAPJ764hElp3wsObxw
+0v3o+UOuDf2c9OaC7cdmynALbFANlCZEYvtxwOh0eAN2lbRkYVi57FGd1tR+dNxU
 8wEAAAAAAAAAFAAAAAAAAAAOQXR0YWNobWVudFR5cGUGAgJpZAAAAQRuYW1lAbbr
 zP9Ln3kyWfBLMU+3ZhKAipfFKFy3Nevjnti/ggWUDUVtYmVkZGVkTWVkaWEGAgR0
-eXBlAr0OlPv7Du3YP01TdZZ9Ogq4k/N+plErIMh06cVgoaN8Zx25t2cX+cNrPPlT
+eXBlAn2whJRMs8nd9egzAfpQE00mZobmWw8XT+Kz52LTQ2K3Zx25t2cX+cNrPPlT
 N13tso4ngAnSYq/4aiPfgdRtPqEEZGF0YQAIAABAAAAAAAAAAAD//wAAAAAAAA1F
 bmdyYXZpbmdEYXRhBgIJYXBwbGllZFRvAWUBVkPkSIzz9xQ0AXnXJego8sBL/EHM
 Oyf2BU/aN3MdB2NvbnRlbnQBK9paYJDDqiMRYBlcjeFnD3jbU/lf3Lc6f7wb4/+R
@@ -35,19 +35,19 @@ YWxpZFByb29mAxRpbnN1ZmZpY2llbnRSZXNlcnZlcwQVaXNzdWVFeGNlZWRzQWxs
 b3dhbmNlBhJub25GcmFjdGlvbmFsVG9rZW4HEm5vbkVuZ3JhdmFibGVUb2tlbggV
 aW52YWxpZEF0dGFjaG1lbnRUeXBlCQpJdGVtc0NvdW50BQEAAAQNT3duZWRGcmFj
 dGlvbgUBAAAICVRva2VuRGF0YQYIBWluZGV4AWUBVkPkSIzz9xQ0AXnXJego8sBL
-/EHMOyf2BU/aN3MdBnRpY2tlcgAEAgAEbm9uZQAAAAEEc29tZQAFAQK9DpT7+w7t
-2D9NU3WWfToKuJPzfqZRKyDIdOnFYKGjfIBXrgf0e5I6zMU2H89A2SmC6EH3V91Z
-sW1728jqvpmlBG5hbWUABAIABG5vbmUAAAABBHNvbWUABQECvQ6U+/sO7dg/TVN1
-ln06CriT836mUSsgyHTpxWCho3xQFBBfDEAmyhKrrjd94m+OPKBgjdNsSD7XD0cZ
-XNM01AdkZXRhaWxzAAQCAARub25lAAAAAQRzb21lAAUBAr0OlPv7Du3YP01TdZZ9
-Ogq4k/N+plErIMh06cVgoaN8Pytyt8SvGmMMttP/CIuvNRCT7kZbnn1HKmEAguRJ
+/EHMOyf2BU/aN3MdBnRpY2tlcgAEAgAEbm9uZQAAAAEEc29tZQAFAQJ9sISUTLPJ
+3fXoMwH6UBNNJmaG5lsPF0/is+di00Nit4BXrgf0e5I6zMU2H89A2SmC6EH3V91Z
+sW1728jqvpmlBG5hbWUABAIABG5vbmUAAAABBHNvbWUABQECfbCElEyzyd316DMB
++lATTSZmhuZbDxdP4rPnYtNDYrdQFBBfDEAmyhKrrjd94m+OPKBgjdNsSD7XD0cZ
+XNM01AdkZXRhaWxzAAQCAARub25lAAAAAQRzb21lAAUBAn2whJRMs8nd9egzAfpQ
+E00mZobmWw8XT+Kz52LTQ2K3Pytyt8SvGmMMttP/CIuvNRCT7kZbnn1HKmEAguRJ
 1+QHcHJldmlldwAEAgAEbm9uZQAAAAEEc29tZQAFAQEr2lpgkMOqIxFgGVyN4WcP
-eNtT+V/ctzp/vBvj/5GqYwVtZWRpYQAEAgAEbm9uZQAAAAEEc29tZQAFAQK9DpT7
-+w7t2D9NU3WWfToKuJPzfqZRKyDIdOnFYKGjfLYf51dO4ILrqWFmX2ausgkwlhIj
-kJZNIGSbJ7XnyHUUC2F0dGFjaG1lbnRzAAoAAAECvQ6U+/sO7dg/TVN1ln06CriT
-836mUSsgyHTpxWCho3y2H+dXTuCC66lhZl9mrrIJMJYSI5CWTSBkmye158h1FAAA
-AAAAAAAAFAAAAAAAAAAIcmVzZXJ2ZXMABAIABG5vbmUAAAABBHNvbWUABQECvQ6U
-+/sO7dg/TVN1ln06CriT836mUSsgyHTpxWCho3wO0ho7GYX49V8a/8cmHVUfa6tL
+eNtT+V/ctzp/vBvj/5GqYwVtZWRpYQAEAgAEbm9uZQAAAAEEc29tZQAFAQJ9sISU
+TLPJ3fXoMwH6UBNNJmaG5lsPF0/is+di00Nit7Yf51dO4ILrqWFmX2ausgkwlhIj
+kJZNIGSbJ7XnyHUUC2F0dGFjaG1lbnRzAAoAAAECfbCElEyzyd316DMB+lATTSZm
+huZbDxdP4rPnYtNDYre2H+dXTuCC66lhZl9mrrIJMJYSI5CWTSBkmye158h1FAAA
+AAAAAAAAFAAAAAAAAAAIcmVzZXJ2ZXMABAIABG5vbmUAAAABBHNvbWUABQECfbCE
+lEyzyd316DMB+lATTSZmhuZbDxdP4rPnYtNDYrcO0ho7GYX49V8a/8cmHVUfa6tL
 8gbNxEj9y5e3xEgJzQpUb2tlbkluZGV4BQEAAAQ=
 
 -----END STRICT TYPE LIB-----