update deps

Author: zoedberg

Cargo.lock

@@ -22,9 +22,9 @@ edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-amplify = "~4.7.0"
-strict_encoding = "~2.7.0"
-strict_types = "~2.7.2"
+amplify = "~4.8.0"
+strict_encoding = "~2.8.1"
+strict_types = "~2.8.2"
 commit_verify = "0.11.0"
 single_use_seals = "0.11.0"
 bp-consensus = { version = "0.11.1-alpha.1", path = "./consensus" }

Cargo.toml

@@ -32,21 +32,21 @@ use crate::{
 };
 
 pub const LIB_ID_BP_TX: &str =
-    "stl:9WwTYiP2-OadKCZP-cR0bJ!Y-qruINYX-bXZFj8Y-fsQoGgo#signal-color-cipher";
+    "stl:9WwTYiP2-OadKCZP-cR0bJ_Y-qruINYX-bXZFj8Y-fsQoGgo#signal-color-cipher";
 pub const LIB_ID_BP_CONSENSUS: &str =
-    "stl:q7G95wzt-SxT2BMV-t!PokBt-wNYgZTu-AaYAtM3-rYjlzs4#agenda-wolf-pagoda";
+    "stl:wUfEZiWN-tvMpLYq-~h1iQC3-bHNSjiW-h9d7O0t-i154uQ0#quiz-patent-exit";
 
 #[deprecated(since = "0.10.8", note = "use _bp_tx_stl instead")]
 fn _bitcoin_stl() -> Result<TypeLib, CompileError> { _bp_tx_stl() }
 
 fn _bp_tx_stl() -> Result<TypeLib, CompileError> {
-    LibBuilder::new(libname!(LIB_NAME_BITCOIN), None).transpile::<Tx>().compile()
+    LibBuilder::with(libname!(LIB_NAME_BITCOIN), None).transpile::<Tx>().compile()
 }
 
 fn _bp_consensus_stl() -> Result<TypeLib, CompileError> {
-    LibBuilder::new(libname!(LIB_NAME_BITCOIN), tiny_bset! {
-        strict_types::stl::std_stl().to_dependency(),
-    })
+    LibBuilder::with(libname!(LIB_NAME_BITCOIN), [
+        strict_types::stl::std_stl().to_dependency_types()
+    ])
     .transpile::<LegacySig>()
     .transpile::<Bip340Sig>()
     .transpile::<OpCode>()

consensus/src/stl.rs

@@ -18,7 +18,7 @@ path = "src/lib.rs"
 
 [dependencies]
 amplify = { workspace = true }
-baid64 = "0.2.2"
+baid64 = "0.4.1"
 single_use_seals = { workspace = true }
 commit_verify = { workspace = true }
 strict_encoding = { workspace = true }

seals/Cargo.toml

@@ -73,7 +73,7 @@ mod test {
 
     #[test]
     fn secret_seal_baid64() {
-        let baid64 = "utxob:xDfmDF9g-yNOjriV-6Anbe6H-MLJ!!g6-lo7Dd4f-dhWBW8S-XYGBm";
+        let baid64 = "utxob:xDfmDF9g-yNOjriV-6Anbe6H-MLJ__g6-lo7Dd4f-dhWBW8S-XYGBm";
         let seal: SecretSeal = baid64.parse().unwrap();
         assert_eq!(baid64, seal.to_string());
         assert_eq!(seal.to_string(), seal.to_baid64_string());

seals/src/secret.rs

@@ -34,7 +34,7 @@ use strict_types::{parse_args, SystemBuilder};
 fn main() {
     let (format, dir) = parse_args();
 
-    let mut lib = bc::stl::bp_tx_stl();
+    let mut lib = bp_tx_stl();
     lib.name = libname!("Tx");
     lib.serialize(
         format,
@@ -81,14 +81,14 @@ fn main() {
         .expect("unable to write to the file");
 
     let std = std_stl();
-    let tx = bp_tx_stl();
+    let consensus = bp_consensus_stl();
     let bp = bp_core_stl();
     let cv = commit_verify_stl();
 
     let sys = SystemBuilder::new()
         .import(bp)
         .unwrap()
-        .import(tx)
+        .import(consensus)
         .unwrap()
         .import(cv)
         .unwrap()

src/bin/bpcore-stl.rs

@@ -48,7 +48,6 @@ pub extern crate dbc;
 pub extern crate seals;
 
 #[cfg(feature = "stl")]
-#[macro_use]
 extern crate amplify;
 #[cfg(feature = "stl")]
 #[macro_use]

src/lib.rs

@@ -31,14 +31,14 @@ use strict_types::{CompileError, LibBuilder, TypeLib};
 /// Strict types id for the library providing data types from [`dbc`] and
 /// [`seals`] crates.
 pub const LIB_ID_BPCORE: &str =
-    "stl:abxDwrpE-mSRfNo!-x4bvuzi-vlsho8Y-uyxOx7l-vkBy9KE#alfonso-andrea-nitro";
+    "stl:Pes7Egpg-6IfFCxl-fFGcbh6-sLkFInB-w26eHfd-unAO5JE#juliet-super-dominic";
 
 fn _bp_core_stl() -> Result<TypeLib, CompileError> {
-    LibBuilder::new(libname!(LIB_NAME_BPCORE), tiny_bset! {
-        strict_types::stl::std_stl().to_dependency(),
-        bc::stl::bp_tx_stl().to_dependency(),
-        commit_verify::stl::commit_verify_stl().to_dependency()
-    })
+    LibBuilder::with(libname!(LIB_NAME_BPCORE), [
+        strict_types::stl::std_stl().to_dependency_types(),
+        bc::stl::bp_consensus_stl().to_dependency_types(),
+        commit_verify::stl::commit_verify_stl().to_dependency_types(),
+    ])
     .transpile::<dbc::Anchor<TapretProof>>()
     .transpile::<dbc::Anchor<OpretProof>>()
     .transpile::<seals::txout::ExplicitSeal<TxPtr>>()

src/stl.rs

@@ -1,7 +1,7 @@
-AnchorOpretProof rec
-  mpcProof rec MerkleProof
-    pos is U32
-    cofactor is U16
-    path list len=0..32
-      element bytes len=32 aka=MerkleHash
-  dbcProof is Unit aka=OpretProof
+rec AnchorOpretProof
+  rec mpcProof, MerkleProof
+    is pos, U32
+    is cofactor, U16
+    list path, len 0..32
+      bytes element, len 32, aka MerkleHash
+  is dbcProof, Unit, aka OpretProof

stl/Anchor.Opret.vesper

@@ -1,11 +1,18 @@
-AnchorTapretProof rec
-  mpcProof rec MerkleProof
-    pos is U32
-    cofactor is U16
-    path list len=0..32
-      element bytes len=32 aka=MerkleHash
-  dbcProof rec TapretProof
-    pathProof rec TapretPathProof
-      some union TapretNodePartner option wrapped tag=1
-        rightBranch rec TapretRightBranch wrapped tag=2
-      nonce is U8
+rec AnchorTapretProof
+  rec mpcProof, MerkleProof
+    is pos, U32
+    is cofactor, U16
+    list path, len 0..32
+      bytes element, len 32, aka MerkleHash
+  rec dbcProof, TapretProof
+    rec pathProof, TapretPathProof
+      union some, TapretNodePartner, option, wrapped, tag 1
+        bytes leftNode, len 32, wrapped, aka TapNodeHash, tag 0
+          rec rightLeaf, LeafScript, wrapped, tag 1
+            is version, U8, aka LeafVer
+            bytes script, len 0..MAX32, aka ScriptBytes
+          rec rightBranch, TapretRightBranch, wrapped, tag 2
+            bytes leftNodeHash, len 32, aka TapNodeHash
+            bytes rightNodeHash, len 32, aka TapNodeHash
+      is nonce, U8
+    bytes internalPk, len 32, aka InternalPk, aka XOnlyPk