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

discuss: spanned AST #678

Draft
wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 5 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
170 changes: 170 additions & 0 deletions Cargo.lock

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

12 changes: 12 additions & 0 deletions evm_arithmetization/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ keywords.workspace = true
[dependencies]
anyhow.workspace = true
bytes.workspace = true
derive-quote-to-tokens = "0.1.1"
derive-syn-parse = "0.2.0"
env_logger.workspace = true
ethereum-types.workspace = true
hashbrown.workspace = true
Expand All @@ -34,6 +36,8 @@ pest_derive.workspace = true
plonky2 = { workspace = true, features = ["parallel"] }
plonky2_maybe_rayon = { workspace = true, features = ["parallel"] }
plonky2_util.workspace = true
proc-macro2.workspace = true
quote.workspace = true
rand.workspace = true
rand_chacha.workspace = true
rlp.workspace = true
Expand All @@ -45,15 +49,20 @@ sha2.workspace = true
smt_trie = { workspace = true, optional = true }
starky = { workspace = true, features = ["parallel"] }
static_assertions.workspace = true
syn.workspace = true
thiserror.workspace = true
tiny-keccak.workspace = true
zk_evm_common.workspace = true
zk_evm_proc_macro.workspace = true

[dev-dependencies]
camino = "1.1.9"
criterion.workspace = true
glob = "0.3.1"
hex.workspace = true
libtest-mimic = "0.7.3"
ripemd.workspace = true
syn-miette = "0.3.0"

[features]
default = ["eth_mainnet"]
Expand All @@ -74,6 +83,9 @@ harness = false
name = "fibonacci_25m_gas"
harness = false

[[test]]
name = "parse"
harness = false

# Display math equations properly in documentation
[package.metadata.docs.rs]
Expand Down
12 changes: 6 additions & 6 deletions evm_arithmetization/src/cpu/kernel/asm/beacon_roots.asm
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/// EIP-4788: Beacon block root in the EVM
/// <https://eips.ethereum.org/EIPS/eip-4788#pseudocode>
///
/// *NOTE*: This will panic if one of the provided timestamps is zero.
// EIP-4788: Beacon block root in the EVM
// <https://eips.ethereum.org/EIPS/eip-4788#pseudocode>
//
// *NOTE*: This will panic if one of the provided timestamps is zero.

/// Pre-stack: (empty)
/// Post-stack: (empty)
// Pre-stack: (empty)
// Post-stack: (empty)
global set_beacon_root:
// stack: (empty)
PUSH txn_loop
Expand Down
2 changes: 1 addition & 1 deletion evm_arithmetization/src/cpu/kernel/asm/bloom_filter.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// Implementation of Bloom filters for logs.
// Implementation of Bloom filters for logs.

// Adds a Bloom entry to the transaction Bloom filter and the block Bloom filter.
//
Expand Down
10 changes: 5 additions & 5 deletions evm_arithmetization/src/cpu/kernel/asm/cdk_pre_execution.asm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/// CDK-Erigon pre-block execution logic.
/// Reference implementation: `cdk-erigon/core/state/intra_block_state_zkevm.go`.
/// This currently supports the Etrog upgrade.
// CDK-Erigon pre-block execution logic.
// Reference implementation: `cdk-erigon/core/state/intra_block_state_zkevm.go`.
// This currently supports the Etrog upgrade.

/// Pre-stack: (empty)
/// Post-stack: (empty)
// Pre-stack: (empty)
// Post-stack: (empty)
global pre_block_execution:
// stack: (empty)
PUSH txn_loop
Expand Down
Loading
Loading