Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Add Cancun-Deneb upgrade support #76

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 81 additions & 25 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ alloy = { git = "https://github.com/alloy-rs/alloy", features = [

# zk-evm dependencies
plonky2 = "0.2.2"
evm_arithmetization = { git = "https://github.com/0xPolygonZero/zk_evm.git", tag = "v0.3.1" }
trace_decoder = { git = "https://github.com/0xPolygonZero/zk_evm.git", tag = "v0.3.1" }
proof_gen = { git = "https://github.com/0xPolygonZero/zk_evm.git", tag = "v0.3.1" }
evm_arithmetization = { git = "https://github.com/0xPolygonZero/zk_evm.git", branch = "feat/cancun" }
trace_decoder = { git = "https://github.com/0xPolygonZero/zk_evm.git", branch = "feat/cancun" }
proof_gen = { git = "https://github.com/0xPolygonZero/zk_evm.git", branch = "feat/cancun" }

[workspace.package]
edition = "2021"
Expand Down
16 changes: 16 additions & 0 deletions rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ where
block_trace: BlockTrace {
trie_pre_images: pre_images.pop().context("trace had no BlockWitness")?,
txn_info,
code_db: None,
},
other_data: OtherBlockData {
b_data: BlockLevelData {
Expand All @@ -143,6 +144,21 @@ where
.into(),
block_gas_used: target_block.header.gas_used.into(),
block_bloom: target_block.header.logs_bloom.compat(),
parent_beacon_block_root: target_block
.header
.parent_beacon_block_root
.context("target block is missing field `parent_beacon_block_root`")?
.compat(),
block_blob_gas_used: target_block
.header
.blob_gas_used
.context("target block is missing field `blob_gas_used`")?
.into(),
block_excess_blob_gas: target_block
.header
.excess_blob_gas
.context("target block is missing field `excess_blob_gas`")?
.into(),
},
b_hashes: BlockHashes {
prev_hashes: prev_hashes.map(|it| it.compat()).into(),
Expand Down
Loading
Loading