From 8ebb68f7297907220b94e48350037ab4153a569b Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sat, 30 Dec 2023 08:41:35 +0100 Subject: [PATCH] chore: update dependencies --- Cargo.lock | 40 +++++++++++++++++++++--------------- Cargo.toml | 6 ------ src/containers/mod.rs | 2 +- src/containers/partials.rs | 4 ++-- src/containers/util.rs | 5 +---- src/interface/contract.rs | 3 +-- src/persistence/inventory.rs | 4 ++-- src/persistence/stock.rs | 6 ++---- 8 files changed, 33 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0333a13..7f4f7b64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,8 @@ dependencies = [ [[package]] name = "bp-consensus" version = "0.11.0-beta.3" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#1d7b50834dc40d84b093ede000de9ad38a9e0996" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190ac89a2a3c79d5bfb677f48e5393691832c540973341831572edaffdce0881" dependencies = [ "amplify", "chrono", @@ -231,8 +232,9 @@ dependencies = [ [[package]] name = "bp-core" -version = "0.11.0-beta.2" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#1d7b50834dc40d84b093ede000de9ad38a9e0996" +version = "0.11.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69269d27e32d784e37f7ca7cdf964fe5e30c5bff1ca2e229a118c84c8efdd179" dependencies = [ "amplify", "bp-consensus", @@ -247,8 +249,9 @@ dependencies = [ [[package]] name = "bp-dbc" -version = "0.11.0-beta.2" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#1d7b50834dc40d84b093ede000de9ad38a9e0996" +version = "0.11.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cef9a98c7ae4f1bb333ad8e55c9d8a91f071c347d35b62e19959faa07572b11" dependencies = [ "amplify", "base85", @@ -273,8 +276,9 @@ dependencies = [ [[package]] name = "bp-seals" -version = "0.11.0-beta.2" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#1d7b50834dc40d84b093ede000de9ad38a9e0996" +version = "0.11.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d211bb77e320abf4bba6c272fc85d73e5203140ca39e299271f4714d8b6029fe" dependencies = [ "amplify", "baid58", @@ -331,7 +335,8 @@ dependencies = [ [[package]] name = "commit_encoding_derive" version = "0.10.0" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#2d3a0a2981409c493067edfc94338088884b1aa7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00033f14d67c4169d588f085ea2faeb7b610cf03a74d42ea09eeba31abef2047" dependencies = [ "amplify", "amplify_syn", @@ -342,8 +347,9 @@ dependencies = [ [[package]] name = "commit_verify" -version = "0.11.0-beta.2" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#2d3a0a2981409c493067edfc94338088884b1aa7" +version = "0.11.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e001679b9be6a5df24facdae179e6ba1cffb503c875d691eac024db8d0f8d1" dependencies = [ "amplify", "commit_encoding_derive", @@ -649,7 +655,7 @@ dependencies = [ [[package]] name = "rgb-core" version = "0.11.0-beta.3" -source = "git+https://github.com/RGB-WG/rgb-core?branch=v0.11#d598eee90dfa21ef9a34a8376342cffa43dbd4e9" +source = "git+https://github.com/RGB-WG/rgb-core?branch=v0.11#744560f68518b19eab7ae8135571910282e72e58" dependencies = [ "aluvm", "amplify", @@ -873,17 +879,18 @@ dependencies = [ [[package]] name = "single_use_seals" -version = "0.11.0-beta.2" +version = "0.11.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c30647a1342641c45ca7c1dcd5ae7db16533b86744e827c84cfed875db2de3fe" +checksum = "1b14ebe6be1e12070208a6f2ceb49f946d835b1f7dfb809a4db025de8f5ffe0a" dependencies = [ "amplify_derive", ] [[package]] name = "strict_encoding" -version = "2.6.1" -source = "git+https://github.com/strict-types/strict-encoding?branch=phantom#2123237a512bbe28e8e419e7d4f899dfedfa758c" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa76decc8ac190a56ba7857c023b69ed52b781ed974c5a181eac62cdbfc99521" dependencies = [ "amplify", "half", @@ -894,7 +901,8 @@ dependencies = [ [[package]] name = "strict_encoding_derive" version = "2.0.1" -source = "git+https://github.com/strict-types/strict-encoding?branch=phantom#2123237a512bbe28e8e419e7d4f899dfedfa758c" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37064ec285e2a633465eb525c8698eea51373dee889fe310e0d32df8343e7f4f" dependencies = [ "amplify_syn", "heck", diff --git a/Cargo.toml b/Cargo.toml index 1b04e577..351cbee2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,10 +93,4 @@ wasm-bindgen-test = "0.3" features = [ "all" ] [patch.crates-io] -strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "phantom" } -commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" } -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" } rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.11" } diff --git a/src/containers/mod.rs b/src/containers/mod.rs index 057daffc..c53bcbd1 100644 --- a/src/containers/mod.rs +++ b/src/containers/mod.rs @@ -46,4 +46,4 @@ pub use disclosure::Disclosure; pub use indexed::IndexedConsignment; pub use partials::{Batch, CloseMethodSet, Fascia, TransitionInfo}; pub use seal::{BuilderSeal, TerminalSeal, VoutSeal}; -pub use util::{ContainerVer, Terminal, XOutpoint}; +pub use util::{ContainerVer, Terminal}; diff --git a/src/containers/partials.rs b/src/containers/partials.rs index 58abb90a..1b0c5704 100644 --- a/src/containers/partials.rs +++ b/src/containers/partials.rs @@ -30,11 +30,11 @@ use amplify::confinement::{Confined, U24}; use bp::seals::txout::CloseMethod; use commit_verify::mpc; use rgb::{ - ContractId, OpId, Operation, Transition, TransitionBundle, TxoSeal, XAnchor, XOutputSeal, + ContractId, OpId, Operation, Transition, TransitionBundle, TxoSeal, XAnchor, XOutpoint, + XOutputSeal, }; use strict_encoding::{StrictDeserialize, StrictDumb, StrictSerialize}; -use crate::containers::XOutpoint; use crate::LIB_NAME_RGB_STD; #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] diff --git a/src/containers/util.rs b/src/containers/util.rs index 80cb4c6b..c0063130 100644 --- a/src/containers/util.rs +++ b/src/containers/util.rs @@ -20,8 +20,7 @@ // limitations under the License. use amplify::confinement::SmallOrdSet; -use bp::{Outpoint, Tx}; -use rgb::XChain; +use bp::Tx; use super::TerminalSeal; use crate::LIB_NAME_RGB_STD; @@ -70,5 +69,3 @@ pub enum ContainerVer { #[default] V2 = 2, } - -pub type XOutpoint = XChain; diff --git a/src/interface/contract.rs b/src/interface/contract.rs index f2eec52a..e001ac4f 100644 --- a/src/interface/contract.rs +++ b/src/interface/contract.rs @@ -26,13 +26,12 @@ use amplify::confinement::{LargeOrdMap, LargeVec, SmallVec}; use bp::Outpoint; use rgb::{ AssetTag, AssignmentType, AttachId, BlindingFactor, ContractId, ContractState, FungibleOutput, - MediaType, RevealedAttach, RevealedData, WitnessId, XOutputSeal, + MediaType, RevealedAttach, RevealedData, WitnessId, XOutpoint, XOutputSeal, }; use strict_encoding::FieldName; use strict_types::typify::TypedVal; use strict_types::{decode, StrictVal}; -use crate::containers::XOutpoint; use crate::interface::{IfaceId, IfaceImpl}; #[derive(Clone, Eq, PartialEq, Debug, Display, Error, From)] diff --git a/src/persistence/inventory.rs b/src/persistence/inventory.rs index f9ed2d82..4ca06e7d 100644 --- a/src/persistence/inventory.rs +++ b/src/persistence/inventory.rs @@ -33,14 +33,14 @@ use invoice::{Beneficiary, InvoiceState, RgbInvoice}; use rgb::{ validation, AnchoredBundle, AssignmentType, BlindingFactor, BundleId, ContractId, GraphSeal, OpId, Operation, Opout, SchemaId, SecretSeal, SubSchema, Transition, TransitionBundle, - WitnessId, XAnchor, XChain, XOutputSeal, + WitnessId, XAnchor, XChain, XOutpoint, XOutputSeal, }; use strict_encoding::TypeName; use crate::accessors::{BundleExt, MergeRevealError, RevealError}; use crate::containers::{ Batch, Bindle, BuilderSeal, Cert, Consignment, ContentId, Contract, Fascia, Terminal, - TerminalSeal, Transfer, TransitionInfo, XOutpoint, + TerminalSeal, Transfer, TransitionInfo, }; use crate::interface::{ BuilderError, ContractIface, Iface, IfaceId, IfaceImpl, IfacePair, IfaceWrapper, diff --git a/src/persistence/stock.rs b/src/persistence/stock.rs index 2f566273..cf7a1483 100644 --- a/src/persistence/stock.rs +++ b/src/persistence/stock.rs @@ -30,13 +30,11 @@ use rgb::{ validation, AnchoredBundle, Assign, AssignmentType, BundleId, ContractHistory, ContractId, ContractState, ExposedState, Extension, Genesis, GenesisSeal, GraphSeal, OpId, Operation, Opout, SecretSeal, SubSchema, Transition, TransitionBundle, TypedAssigns, WitnessAnchor, - WitnessId, XAnchor, XChain, XOutputSeal, + WitnessId, XAnchor, XChain, XOutpoint, XOutputSeal, }; use strict_encoding::{StrictDeserialize, StrictSerialize}; -use crate::containers::{ - Bindle, Cert, Consignment, ContentId, Contract, TerminalSeal, Transfer, XOutpoint, -}; +use crate::containers::{Bindle, Cert, Consignment, ContentId, Contract, TerminalSeal, Transfer}; use crate::interface::{ ContractIface, Iface, IfaceId, IfaceImpl, IfacePair, SchemaIfaces, TypedState, };