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: trie mask issue #613

Draft
wants to merge 60 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
036fd1f
mark: 0xaatif/trace-decoder-backend-rewrite4
0xaatif Sep 2, 2024
1b89a35
refactor: initial implementation
0xaatif Sep 2, 2024
3fdd2bc
refactor: switcheroo
0xaatif Sep 2, 2024
844971f
fix: batch
0xaatif Sep 2, 2024
0407031
refactor: trace_decoder tests do not expect json array in files
0xaatif Sep 2, 2024
408273a
chore: trace_decoder test inputs are no longer arrays
0xaatif Sep 2, 2024
c83f223
feat: trace_decoder/examples/dump.rs
0xaatif Sep 2, 2024
6771d0c
Revert "chore: trace_decoder test inputs are no longer arrays"
0xaatif Sep 2, 2024
2a6d843
Revert "refactor: trace_decoder tests do not expect json array in files"
0xaatif Sep 2, 2024
322def0
refactor: dump accept multi
0xaatif Sep 2, 2024
fd2e90d
add --quiet
0xaatif Sep 2, 2024
81907a9
fix: remove unaccessed storage tries
0xaatif Sep 3, 2024
e05f3d0
test: ab
0xaatif Sep 3, 2024
4511b80
test: break out common
0xaatif Sep 3, 2024
3546b42
test: a/b
0xaatif Sep 4, 2024
d11a365
fix: imp::batch
0xaatif Sep 4, 2024
69ed607
fix: storage shenanigans
0xaatif Sep 4, 2024
69249b0
refactor(ci): separate build for tests
0xaatif Sep 4, 2024
42b5d68
refactor(ci): refactor conditions
0xaatif Sep 4, 2024
ace2af1
Merge remote-tracking branch 'origin/develop' into 0xaatif/trace-deco…
0xaatif Sep 4, 2024
085e97f
chore: change CI names
0xaatif Sep 4, 2024
ece25d3
chore: cargo run --quiet in stdio.sh
0xaatif Sep 4, 2024
13304bb
fix: special case empty txn_info
0xaatif Sep 4, 2024
1dbc67a
Revert "fix: special case empty txn_info"
0xaatif Sep 4, 2024
ac673da
fix?: special case dummy batch
0xaatif Sep 5, 2024
5be5357
Revert "fix?: special case dummy batch"
0xaatif Sep 5, 2024
592aa3a
try: do not run cancun hook on dummy txns
0xaatif Sep 5, 2024
211bcbf
Revert "try: do not run cancun hook on dummy txns"
0xaatif Sep 5, 2024
50108d9
fix: do not increment txn numbers for dummy txns
0xaatif Sep 5, 2024
2a7ac06
Revert "chore: change CI names"
0xaatif Sep 5, 2024
2a50ca1
run: rm trace_decoder/tests/common/mod.rs trace_decoder/tests/ab.rs
0xaatif Sep 5, 2024
c9036fb
Merge remote-tracking branch 'origin/develop' into 0xaatif/trace-deco…
0xaatif Sep 5, 2024
325b27f
fix: withdrawals on empty txns
0xaatif Sep 5, 2024
0862062
chore: trace_decoder::iface
0xaatif Sep 5, 2024
432e223
refactor: remove old impl
0xaatif Sep 5, 2024
aa0f425
chore: rename ci
0xaatif Sep 5, 2024
6cc97ad
refactor: trim_to -> mask
0xaatif Sep 5, 2024
457c5f2
doc: librar
0xaatif Sep 6, 2024
5f6cea8
refactor: tweak variable names
0xaatif Sep 6, 2024
f94f7f5
chore: tweaks
0xaatif Sep 6, 2024
11e0cc4
refactor: remove dead StateTrie::contains_address
0xaatif Sep 6, 2024
3f3fb37
chore: comment
0xaatif Sep 6, 2024
fd128b0
fix: broken links
0xaatif Sep 6, 2024
33d1c95
Merge remote-tracking branch 'origin/develop' into 0xaatif/trace-deco…
0xaatif Sep 6, 2024
92fa796
run: rm trace_decoder/src/imp_pass.rs
0xaatif Sep 6, 2024
a1efa56
chore: dep fmt
0xaatif Sep 6, 2024
ff1dd67
doc: cancun hook
0xaatif Sep 6, 2024
ff0b9d7
chore: iface -> interface
0xaatif Sep 6, 2024
a34c3e1
chore: doc rf
0xaatif Sep 6, 2024
ecb69d2
chore: doc
0xaatif Sep 6, 2024
42111c6
chore: imp -> core
0xaatif Sep 6, 2024
c8f7e77
chore: `batch_size_hint`
0xaatif Sep 6, 2024
c5bbe6b
chore: just_access
0xaatif Sep 6, 2024
eadf48d
Merge remote-tracking branch 'origin/develop' into 0xaatif/trace-deco…
0xaatif Sep 9, 2024
8639067
review: markups
0xaatif Sep 9, 2024
ab5c74e
refactor: NamedConstant
0xaatif Sep 9, 2024
66bf870
mark: 0xaatif/discuss-trie-mask
0xaatif Sep 9, 2024
cfe6d42
chore: shim
0xaatif Sep 9, 2024
befc4ba
prove: mpt library is not robust either :)
0xaatif Sep 9, 2024
d263e91
wip: check-subsets
0xaatif Sep 9, 2024
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
30 changes: 17 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Test mpt_trie
runs-on: ubuntu-latest
timeout-minutes: 30
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -47,7 +47,12 @@ jobs:
name: Test trace_decoder
runs-on: zero-ci
timeout-minutes: 30
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
env:
RUST_LOG: info
CARGO_INCREMENTAL: 1
RUST_BACKTRACE: 1

if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -60,18 +65,17 @@ jobs:
with:
cache-on-failure: true

- name: Test in trace_decoder subdirectory
- name: build # build separately so test logs are actually nice
run: cargo build --tests --manifest-path trace_decoder/Cargo.toml

- name: test
run: cargo test --release --manifest-path trace_decoder/Cargo.toml -- --nocapture
env:
RUST_LOG: info
CARGO_INCREMENTAL: 1
RUST_BACKTRACE: 1

test_proof_gen:
name: Test proof_gen
runs-on: ubuntu-latest
timeout-minutes: 30
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -96,7 +100,7 @@ jobs:
name: Test evm_arithmetization
runs-on: ubuntu-latest
timeout-minutes: 30
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -121,7 +125,7 @@ jobs:
name: Test zero_bin
runs-on: ubuntu-latest
timeout-minutes: 30
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -132,7 +136,7 @@ jobs:
- name: Set up rust cache
uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
cache-on-failure: true

- name: Test in zero_bin subdirectory
run: |
Expand All @@ -154,7 +158,7 @@ jobs:
name: Test zk_evm_proc_macro
runs-on: ubuntu-latest
timeout-minutes: 30
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand Down Expand Up @@ -218,7 +222,7 @@ jobs:
name: Rustdoc, Formatting and Clippy
runs-on: ubuntu-latest
timeout-minutes: 10
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
*.iml
.idea/
.vscode
/**/*.ignoreme
**/output.log

Loading
Loading