Skip to content

Commit

Permalink
chore: use twenty-first compat with blockexplorer
Browse files Browse the repository at this point in the history
Uses cargo patch to update to a more recent version of twenty-first
0.41 that is also used by the block-explorer.
  • Loading branch information
dan-da committed May 10, 2024
1 parent f1b3d57 commit 5ef2423
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down Expand Up @@ -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" }
4 changes: 2 additions & 2 deletions src/models/blockchain/block/block_selector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -62,7 +62,7 @@ pub enum BlockSelectorParseError {
WrongSelectorLength(usize),

#[error("Bad Digest")]
BadDigest(#[from] FromHexDigestError),
BadDigest(#[from] TryFromHexDigestError),

#[error("Bad Height")]
BadHeight(#[from] ParseIntError),
Expand Down

0 comments on commit 5ef2423

Please sign in to comment.