Skip to content

Commit d602de3

Browse files
committed
Modernized BLST and deps
1 parent dd497cf commit d602de3

6 files changed

Lines changed: 170 additions & 19 deletions

File tree

Cargo.lock

Lines changed: 155 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ axum = { version = "0.8.1", features = ["macros"] }
2424
axum-extra = { version = "0.10.0", features = ["typed-header"] }
2525
base64 = "0.22.1"
2626
bimap = { version = "0.6.3", features = ["serde"] }
27-
# blsful = "2.5"
27+
blst = "^0.3.15"
28+
blsful = "^2.5"
2829
bytes = "1.10.1"
2930
cb-cli = { path = "crates/cli" }
3031
cb-common = { path = "crates/common" }
@@ -61,6 +62,7 @@ serde_json = "1.0.117"
6162
serde_yaml = "0.9.33"
6263
sha2 = "0.10.8"
6364
ssz_types = "0.11"
65+
subtle = "2.5"
6466
tempfile = "3.20.0"
6567
thiserror = "2.0.12"
6668
tokio = { version = "1.37.0", features = ["full"] }
@@ -78,3 +80,6 @@ typenum = "1.17.0"
7880
unicode-normalization = "0.1.24"
7981
url = { version = "2.5.0", features = ["serde"] }
8082
uuid = { version = "1.8.0", features = ["fast-rng", "serde", "v4"] }
83+
84+
[patch.crates-io]
85+
blstrs_plus = { git = "https://github.com/Commit-Boost/blstrs" }

crates/common/src/signer/schemes/ecdsa.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{ops::Deref, str::FromStr};
22

33
use alloy::{
4-
primitives::{Address, B256, PrimitiveSignature},
4+
primitives::{Address, B256, Signature, aliases::B32},
55
signers::{SignerSync, local::PrivateKeySigner},
66
};
77
use eyre::ensure;
@@ -14,7 +14,7 @@ use crate::{
1414
};
1515

1616
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
17-
pub struct EcdsaSignature(PrimitiveSignature);
17+
pub struct EcdsaSignature(Signature);
1818

1919
impl std::fmt::Display for EcdsaSignature {
2020
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -37,18 +37,18 @@ impl<'de> serde::Deserialize<'de> for EcdsaSignature {
3737
D: serde::Deserializer<'de>,
3838
{
3939
let s = String::deserialize(deserializer)?;
40-
Ok(Self(PrimitiveSignature::from_str(&s).map_err(serde::de::Error::custom)?))
40+
Ok(Self(Signature::from_str(&s).map_err(serde::de::Error::custom)?))
4141
}
4242
}
4343

44-
impl From<PrimitiveSignature> for EcdsaSignature {
45-
fn from(signature: PrimitiveSignature) -> Self {
44+
impl From<Signature> for EcdsaSignature {
45+
fn from(signature: Signature) -> Self {
4646
Self(signature)
4747
}
4848
}
4949

5050
impl Deref for EcdsaSignature {
51-
type Target = PrimitiveSignature;
51+
type Target = Signature;
5252

5353
fn deref(&self) -> &Self::Target {
5454
&self.0

crates/common/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ pub trait TestRandomSeed: TestRandom {
434434
where
435435
Self: Sized,
436436
{
437-
let mut rng = XorShiftRng::from_entropy();
437+
let mut rng = XorShiftRng::from_os_rng();
438438
Self::random_for_test(&mut rng)
439439
}
440440
}

0 commit comments

Comments
 (0)