Skip to content

Commit

Permalink
Move peerdas into fulu, refactor code
Browse files Browse the repository at this point in the history
Fix multiple definition of functions, linking issues
  • Loading branch information
hangleang committed Dec 30, 2024
1 parent fab794d commit a995301
Show file tree
Hide file tree
Showing 57 changed files with 2,057 additions and 2,206 deletions.
284 changes: 141 additions & 143 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ itertools = '0.13'
jemalloc-ctl = '0.5'
jemallocator = '0.5'
jwt-simple = { version = '0.12', default-features = false, features = ['pure-rust'] }
kzg = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw' }
kzg = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw-2' }
lazy_static = '1'
libmdbx = { git = 'https://github.com/paradigmxyz/reth.git', package = 'reth-libmdbx', rev = 'c228fe15808c3acbf18dc3af1a03ef5cbdcda07a' }
libp2p = { version = '0.54', default-features = false, features = ['metrics', 'dns', 'ecdsa', 'identify', 'macros', 'noise', 'plaintext', 'secp256k1', 'serde', 'tcp', 'tokio', 'yamux', 'quic', 'upnp'] }
Expand Down Expand Up @@ -399,7 +399,7 @@ regex = '1'
replace_with = '0.1'
reqwest = { version = '0.12', features = ['json', 'native-tls-vendored'] }
rusqlite = { version = '0.32', features = ['bundled'] }
rust-kzg-blst = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw' }
rust-kzg-blst = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw-2' }
scrypt = '0.11'
semver = '1'
serde = { version = '1', features = ['derive', 'rc'] }
Expand Down
2 changes: 1 addition & 1 deletion ad_hoc_bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ rand = { workspace = true }
types = { workspace = true }

[target.'cfg(not(windows))'.dependencies]
jemalloc-ctl = { workspace = true }
jemalloc-ctl = { workspace = true }
1 change: 0 additions & 1 deletion block_producer/src/block_producer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,6 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
.take(P::MaxAttestationsElectra::USIZE);

ContiguousList::try_from_iter(attestations)?

};

BeaconBlock::from(FuluBeaconBlock {
Expand Down
7 changes: 4 additions & 3 deletions eip_7594/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ workspace = true
[dependencies]
anyhow = { workspace = true }
c-kzg = { workspace = true }
hashing = { workspace = true }
helper_functions = { workspace = true }
itertools = { workspace = true }
kzg = { workspace = true }
num-traits = { workspace = true }
ssz = { workspace = true}
Expand All @@ -20,10 +18,13 @@ thiserror = { workspace = true }
try_from_iterator = { workspace = true }
typenum = { workspace = true }
types = { workspace = true }
prometheus_metrics = { workspace = true }
prometheus_metrics = { workspace = true, optional = true }

[dev-dependencies]
duplicate = { workspace = true }
serde = { workspace = true }
spec_test_utils = { workspace = true }
test-generator = { workspace = true }

[features]
metrics = ['prometheus_metrics']
22 changes: 22 additions & 0 deletions eip_7594/src/error.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
use thiserror::Error;

#[derive(Debug, Error)]
pub enum Error {
#[error(
"Custody group count is invalid: {custody_group_count} expected <= {number_of_custody_groups}",
)]
InvalidCustodyGroupCount {
custody_group_count: u64,
number_of_custody_groups: u64,
},
#[error("Custody group is invalid: {custody_group} expected < {number_of_custody_groups}")]
InvalidCustodyGroup {
custody_group: u64,
number_of_custody_groups: u64,
},
#[error("Number of blobs {blob_count} does not match commitment length {commitments_length}")]
BlobCommitmentsLengthMismatch {
blob_count: usize,
commitments_length: usize,
},
}
Loading

0 comments on commit a995301

Please sign in to comment.