diff --git a/Cargo.lock b/Cargo.lock index fc6c21d5..0ef64c97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3127,8 +3127,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twenty-first" version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453cce0ee28de3ffeb768cb158ffebbe55a9cd6bfb7bada1fac2d1853597c3bf" +source = "git+https://github.com/Neptune-Crypto/twenty-first.git?rev=0d2cb98c0495d30e53d28e82a35de44dc655c3ea#0d2cb98c0495d30e53d28e82a35de44dc655c3ea" dependencies = [ "arbitrary", "bfieldcodec_derive", diff --git a/Cargo.toml b/Cargo.toml index 575eae75..4ba28647 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ tarpc = { version = "^0.34", features = [ "serde-transport-json", "tcp", ] } -tasm-lib = { git = "https://github.com/TritonVM/tasm-lib.git", rev = "694f27daf78aade0ed0dc07e3babaab036cd5572" } +tasm-lib = "0.2.1" tiny-bip39 = "1.0" tokio = { version = "1.37", features = ["full", "tracing"] } tokio-serde = { version = "0.8", features = ["bincode", "json"] } @@ -121,3 +121,10 @@ harness = false [[bench]] name = "archival_mmr" harness = false + +[patch.crates-io] +# 694f27daf78aade0ed0dc07e3babaab036cd5572 is tip of branch: master as of 2024-04-30 +tasm-lib = { git = "https://github.com/TritonVM/tasm-lib.git", rev = "694f27daf78aade0ed0dc07e3babaab036cd5572" } + +# 0d2cb98c0495d30e53d28e82a35de44dc655c3ea = tip of branch: master, on 2024-04-24 +twenty-first = { git = "https://github.com/Neptune-Crypto/twenty-first.git", rev = "0d2cb98c0495d30e53d28e82a35de44dc655c3ea" } \ No newline at end of file diff --git a/src/models/blockchain/block/block_selector.rs b/src/models/blockchain/block/block_selector.rs index 6fe59114..c52072fb 100644 --- a/src/models/blockchain/block/block_selector.rs +++ b/src/models/blockchain/block/block_selector.rs @@ -15,7 +15,7 @@ use super::block_height::BlockHeight; use crate::models::state::GlobalState; -use crate::twenty_first::error::FromHexDigestError; +use crate::twenty_first::error::TryFromHexDigestError; use crate::twenty_first::math::digest::Digest; use serde::{Deserialize, Serialize}; use std::num::ParseIntError; @@ -62,7 +62,7 @@ pub enum BlockSelectorParseError { WrongSelectorLength(usize), #[error("Bad Digest")] - BadDigest(#[from] FromHexDigestError), + BadDigest(#[from] TryFromHexDigestError), #[error("Bad Height")] BadHeight(#[from] ParseIntError),