Update to new develop branches with rgb-std/275 fix

RGB-WG · Oct 12, 2024 · 1c27e9c · 1c27e9c
1 parent 4a242d6
commit 1c27e9c
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/amplify-nonasync b/amplify-nonasync
diff --git a/bp-core b/bp-core
diff --git a/bp-esplora-client b/bp-esplora-client
diff --git a/bp-std b/bp-std
diff --git a/bp-wallet b/bp-wallet
diff --git a/rgb b/rgb
diff --git a/rgb-core b/rgb-core
diff --git a/rgb-interfaces b/rgb-interfaces
diff --git a/rgb-schemata b/rgb-schemata
diff --git a/rgb-std b/rgb-std
diff --git a/tests/transfers.rs b/tests/transfers.rs
@@ -771,7 +771,7 @@ fn tapret_wlt_receiving_opret() {
         TransferType::Blinded,
         contract_id,
         &iface_type_name,
-        300,
+        290,
         1000,
         None,
     );

diff --git a/tests/utils/helpers.rs b/tests/utils/helpers.rs
@@ -859,7 +859,7 @@ impl TestWallet {
         self.sync();
         let resolver = self.get_resolver();
         let validate_start = Instant::now();
-        let validated_consignment = consignment.validate(&resolver, self.testnet()).unwrap();
+        let validated_consignment = consignment.validate(&resolver, self.testnet()).map_err(|(status, _)| status).unwrap();
         let validate_duration = validate_start.elapsed();
         if let Some(report) = report {
             report.write_duration(validate_duration);
+7 −7		Cargo.lock
+2 −2		Cargo.toml
+11 −5		src/persistence.rs
+1 −1		.github/workflows/build.yml
+1 −1		Cargo.toml
+1 −1		MANIFEST.yml
+8 −14		dbc/src/anchor.rs
+2 −1		dbc/src/opret/mod.rs
+2 −2		dbc/src/proof.rs
+2 −1		dbc/src/tapret/mod.rs
+1 −0		seals/src/txout/witness.rs
+1 −1		src/stl.rs
+1 −0		Cargo.toml
+12 −15		src/async.rs
+4 −1		src/blocking.rs
+4 −8		Cargo.lock
+6 −0		Cargo.toml
+1 −1		derive/src/taptree.rs
+2 −2		derive/src/xkey.rs
+1 −3		psbt/src/coders.rs
+0 −3		psbt/src/constructor.rs
+5 −0		psbt/src/csval/dbc.rs
+1 −1		psbt/src/csval/tapret.rs
+8 −8		psbt/src/data.rs
+7 −14		Cargo.lock
+9 −0		Cargo.toml
+ −		interfaces/RGB20.rgb
+22 −22		interfaces/RGB20.rgba
+ −		interfaces/RGB21.rgb
+6 −6		interfaces/RGB21.rgba
+ −		interfaces/RGB25.rgb
+6 −6		interfaces/RGB25.rgba
+25 −17		src/rgb20/wrapper.rs
+22 −3		src/rgb21/wrapper.rs
+14 −3		src/rgb25/wrapper.rs
+1 −1		.github/workflows/run.yaml
+8 −16		Cargo.lock
+10 −0		Cargo.toml
+1 −1		src/nia.rs
+5 −10		Cargo.lock
+7 −0		Cargo.toml
+246 −297		src/containers/anchors.rs
+10 −15		src/containers/consignment.rs
+5 −4		src/containers/indexed.rs
+2 −1		src/containers/mod.rs
+58 −7		src/containers/partials.rs
+46 −12		src/contract/assignments.rs
+0 −68		src/contract/bundle.rs
+1 −3		src/contract/mod.rs
+281 −231		src/interface/contract.rs
+56 −34		src/interface/filter.rs
+11 −2		src/interface/iface.rs
+3 −3		src/interface/mod.rs
+1 −2		src/lib.rs
+4 −4		src/persistence/index.rs
+57 −20		src/persistence/memory.rs
+96 −18		src/persistence/stash.rs
+29 −40		src/persistence/state.rs
+70 −56		src/persistence/stock.rs
+2 −2		src/stl/stl.rs
+290 −291		stl/[email protected]
+ −		stl/[email protected]
+55 −50		stl/[email protected]
+91 −91		stl/[email protected]
+ −		stl/[email protected]
+91 −91		stl/[email protected]
+537 −543		stl/Transfer.vesper
-Original file line number
+Diff line change
@@ Expand Up / @@ -771,7 +771,7 @@ fn tapret_wlt_receiving_opret() { @@
             TransferType::Blinded,
             contract_id,
             &iface_type_name,
-,
+,
 ,
             None,
         );
@@ Expand Down @@