chore: use new DBC method APIs

RGB-WG · Oct 12, 2024 · c7fe4e7 · c7fe4e7
1 parent c2a7ff7
commit c7fe4e7
Show file tree

Hide file tree

Showing 10 changed files with 263 additions and 261 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -97,3 +97,10 @@ wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
 features = ["all"]
+
+[patch.crates-io]
+bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "methods" }
+bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "methods" }
+bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "methods" }
+bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "methods" }
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "methods" }
diff --git a/src/containers/anchors.rs b/src/containers/anchors.rs
@@ -293,7 +293,7 @@ impl<D: dbc::Proof> ClientBundle<D> {
  ///
  /// Panics if DBC proof and bundle have different closing methods
  pub fn new(mpc_proof: mpc::MerkleProof, dbc_proof: D, bundle: TransitionBundle) -> Self {
- assert_eq!(D::METHOD, bundle.close_method);
+ assert_eq!(dbc_proof.method(), bundle.close_method);
  Self {
  mpc_proof,
  dbc_proof,

diff --git a/src/stl/stl.rs b/src/stl/stl.rs
@@ -41,7 +41,7 @@ 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_STORAGE: &str =
- "stl:7gJzyOSk-9kGbkdS-oKUNJvS-tk6p!Hw-!uhig0T-fkZgi4g#serial-cake-educate";
+ "stl:t8loV$Vb-Z8hGMSi-pC9dCUe-Lpy$rm8-CGtTeJa-6ll2sCk#guest-infant-crash";
 
 /// Strict types id for the library providing standard data types which may be
 /// used in RGB smart contracts.
@@ -50,7 +50,7 @@ pub const LIB_ID_RGB_CONTRACT: &str =
 
 /// Strict types id for the library representing of RGB StdLib data types.
 pub const LIB_ID_RGB_STD: &str =
- "stl:xjwnXqkB-dTDlmmW-QIpkDHJ-$!ERsTT-Tdsz4MM-7JIQTT8#jessica-tropic-song";
+ "stl:JhUC5JgH-Kwps4cO-ZNUklUj-UP6boFp-OY!18Kx-xOSJaVQ#hair-magnum-helena";
 
 fn _rgb_std_stl() -> Result<TypeLib, CompileError> {
  LibBuilder::new(libname!(LIB_NAME_RGB_STD), tiny_bset! {

diff --git a/stl/[email protected] b/stl/[email protected]
diff --git a/stl/[email protected] b/stl/[email protected]
diff --git a/stl/[email protected] b/stl/[email protected]
@@ -1,5 +1,5 @@
 {-
- Id: stl:xjwnXqkB-dTDlmmW-QIpkDHJ-$!ERsTT-Tdsz4MM-7JIQTT8#jessica-tropic-song
+ Id: stl:JhUC5JgH-Kwps4cO-ZNUklUj-UP6boFp-OY!18Kx-xOSJaVQ#hair-magnum-helena
  Name: RGBStd
  Version: 0.11.0
  Description: RGB standard library
@@ -11,32 +11,7 @@
 @context
 typelib RGBStd
 
-import StrictTypes#century-comrade-chess
- use VariantName#theory-austin-before
- use FieldName#present-flute-herman
- use Primitive#deliver-arrow-boxer
- use TySemId#popcorn-super-young
- use FieldSemId#spiral-road-marco
- use TypeName#edgar-carol-mystery
- use UnnamedFieldsSemId#freedom-degree-gregory
- use SemId#logic-absorb-hilton
- use Variant#humor-regard-promise
- use Sizing#courage-alien-salon
- use NamedFieldsSemId#solar-salad-smoke
- use EnumVariants#dispute-natasha-vega
- use VariantInfoSemId#museum-edward-mirror
- use UnionVariantsSemId#santana-address-pepper
- use TypeSystem#adrian-boris-sponsor
-
-import AluVM#congo-archive-folio
- use Lib#gate-biology-optimal
- use LibSite#ultra-grace-message
- use IsaName#taboo-olympic-cloud
- use LibId#germany-culture-olivia
- use IsaSeg#size-shake-olga
- use LibSeg#lemon-philips-horse
-
-import RGBCommit#tuna-safari-design
+import RGBCommit#harvest-person-orion
  use ExtensionSchema#active-eddie-empty
  use BundleId#carmen-farmer-diesel
  use AttachState#lady-japan-fiesta
@@ -106,15 +81,24 @@ import RGBCommit#tuna-safari-design
  use RevealedData#olivia-copper-stamp
  use AssignRevealedValueBlindSealTxid#photo-jump-silicon
 
-import CommitVerify#miller-pancake-elastic
- use MerkleHash#horse-popcorn-bundle
- use MerkleProof#price-aloha-grid
- use ReservedBytes1#origin-roger-relax
- use ReservedBytes2#florida-libra-circus
- use ReservedBytes4#young-goblin-academy
- use ReservedBytes8#rudolf-tape-adrian
+import StrictTypes#century-comrade-chess
+ use VariantName#theory-austin-before
+ use FieldName#present-flute-herman
+ use Primitive#deliver-arrow-boxer
+ use TySemId#popcorn-super-young
+ use FieldSemId#spiral-road-marco
+ use TypeName#edgar-carol-mystery
+ use UnnamedFieldsSemId#freedom-degree-gregory
+ use SemId#logic-absorb-hilton
+ use Variant#humor-regard-promise
+ use Sizing#courage-alien-salon
+ use NamedFieldsSemId#solar-salad-smoke
+ use EnumVariants#dispute-natasha-vega
+ use VariantInfoSemId#museum-edward-mirror
+ use UnionVariantsSemId#santana-address-pepper
+ use TypeSystem#adrian-boris-sponsor
 
-import BPCore#totem-holiday-helena
+import BPCore#austin-story-retro
  use TapretNodePartner#roger-member-educate
  use TapretProof#marco-border-sample
  use TapretPathProof#kiwi-mirror-paris
@@ -126,6 +110,22 @@ import BPCore#totem-holiday-helena
  use BlindSealTxid#media-judge-anita
  use TxPtr#italian-july-eddie
 
+import AluVM#congo-archive-folio
+ use Lib#gate-biology-optimal
+ use LibSite#ultra-grace-message
+ use IsaName#taboo-olympic-cloud
+ use LibId#germany-culture-olivia
+ use IsaSeg#size-shake-olga
+ use LibSeg#lemon-philips-horse
+
+import CommitVerify#miller-pancake-elastic
+ use MerkleHash#horse-popcorn-bundle
+ use MerkleProof#price-aloha-grid
+ use ReservedBytes1#origin-roger-relax
+ use ReservedBytes2#florida-libra-circus
+ use ReservedBytes4#young-goblin-academy
+ use ReservedBytes8#rudolf-tape-adrian
+
 import Std#ralph-blue-lucky
  use AlphaCaps#picnic-soprano-aurora
  use AsciiPrintable#ultra-sunset-format