Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement EIP-7688: Forward compatible consensus data structures [WIP] #5920

Open
wants to merge 11 commits into
base: unstable
Choose a base branch
from
Next Next commit
Begin stable containers
  • Loading branch information
macladson committed Jul 1, 2024
commit 723339ac893b6c60f5a86193473941d8ac5b8024
25 changes: 11 additions & 14 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -118,8 +118,8 @@ error-chain = "0.12"
ethereum-types = "0.14"
ethereum_hashing = "0.6.0"
ethereum_serde_utils = "0.5.2"
ethereum_ssz = "0.5"
ethereum_ssz_derive = "0.5"
ethereum_ssz = { git = "https://github.com/macladson/ethereum_ssz", branch = "stable-container" }
ethereum_ssz_derive = { git = "https://github.com/macladson/ethereum_ssz", branch = "stable-container" }
ethers-core = "1"
ethers-providers = { version = "1", default-features = false }
exit-future = "0.2"
@@ -134,7 +134,7 @@ libsecp256k1 = "0.7"
log = "0.4"
lru = "0.12"
maplit = "1"
milhouse = "0.1"
milhouse = { git = "https://github.com/macladson/milhouse", branch = "stable-container" }
num_cpus = "1"
parking_lot = "0.12"
paste = "1"
@@ -160,7 +160,7 @@ slog-term = "2"
sloggers = { version = "2", features = ["json"] }
smallvec = "1.11.2"
snap = "1"
ssz_types = "0.6"
ssz_types = { git = "https://github.com/macladson/ssz_types", branch = "stable-container" }
strum = { version = "0.24", features = ["derive"] }
superstruct = "0.8"
syn = "1"
@@ -174,8 +174,8 @@ tracing-appender = "0.2"
tracing-core = "0.1"
tracing-log = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tree_hash = "0.6"
tree_hash_derive = "0.6"
tree_hash = { git = "https://github.com/macladson/tree_hash", branch = "stable-container" }
tree_hash_derive = { git = "https://github.com/macladson/tree_hash", branch = "stable-container" }
url = "2"
uuid = { version = "0.8", features = ["serde", "v4"] }
warp = { version = "0.3.7", default-features = false, features = ["tls"] }
2 changes: 1 addition & 1 deletion beacon_node/beacon_chain/src/beacon_chain.rs
Original file line number Diff line number Diff line change
@@ -3286,7 +3286,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
{
let mut slashable_cache = self.observed_slashable.write();
for header in blobs
.into_iter()
.iter()
.filter_map(|b| b.as_ref().map(|b| b.signed_block_header.clone()))
.unique()
{
Original file line number Diff line number Diff line change
@@ -215,7 +215,7 @@ impl<E: EthSpec> PendingComponents<E> {
};
let num_blobs_expected = diet_executed_block.num_blobs_expected();
let Some(verified_blobs) = verified_blobs
.into_iter()
.iter()
.cloned()
.map(|b| b.map(|b| b.to_blob()))
.take(num_blobs_expected)
Loading