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

feat: Optimism Derivation Proof Composition #69

Merged
merged 130 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from 123 commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
7b08224
transactions module
hashcashier Aug 31, 2023
07c0335
TxEssence trait
hashcashier Aug 31, 2023
ff74eeb
Generic Transaction struct
hashcashier Aug 31, 2023
7fd240c
tx essence as a generic parameter
hashcashier Aug 31, 2023
cb1b7d5
OptimismTxEssence
hashcashier Aug 31, 2023
a3d826b
op chain spec
hashcashier Aug 31, 2023
c27cfcf
OpTxExecStrategy
hashcashier Aug 31, 2023
133e881
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op
hashcashier Aug 31, 2023
b261dbf
redundant block builder type params
hashcashier Sep 5, 2023
3dc1629
strategy bundles
hashcashier Sep 5, 2023
ca30106
host binary parameters
hashcashier Sep 5, 2023
7e5ce52
profiling flag
hashcashier Sep 6, 2023
b267f3f
optimism
hashcashier Sep 6, 2023
16db242
new derivation binary skeleton, copy over libs
hashcashier Sep 6, 2023
dc4a251
providers and conversion utils
hashcashier Sep 7, 2023
2fa1919
epoch transitioning
hashcashier Sep 7, 2023
2ca612d
basic derive flow
hashcashier Sep 8, 2023
2482e7d
host-side derivation
hashcashier Sep 8, 2023
b67f8ba
read metadata from op head
hashcashier Sep 8, 2023
c8fdfb3
op-derive guest
hashcashier Sep 8, 2023
2b1df5c
disable guest memory leaks
hashcashier Sep 8, 2023
25b97c0
heapless batch derivation
hashcashier Sep 11, 2023
4839400
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op-derive
hashcashier Sep 19, 2023
912786d
Pull from main
intoverflow Oct 16, 2023
f2c8076
Merge with main
intoverflow Oct 23, 2023
dd471d5
Add missing import
intoverflow Oct 23, 2023
187cebc
Remove heapless BinaryHeap
intoverflow Oct 27, 2023
33df195
Remove heapless
intoverflow Oct 27, 2023
4805a4b
Merge from main
intoverflow Oct 31, 2023
83f482d
Merge branch 'rkhalil/op-derive' of github.com:risc0/zeth into tcarst…
intoverflow Oct 31, 2023
5f958a7
Introduce op-derive tool
intoverflow Oct 31, 2023
a479a33
Remove ethers types from BatcherDb trait
intoverflow Nov 2, 2023
531a5e3
Verify new op block has correct transaction list
intoverflow Nov 2, 2023
1f94958
Move derive logic into library
intoverflow Nov 2, 2023
5aeb237
Fix bug in transaction trie reconstruction
intoverflow Nov 2, 2023
3842e72
Introduce get_op_header() to BatcherDb
intoverflow Nov 2, 2023
c6c02a2
Merge with main
intoverflow Nov 20, 2023
973c451
Clippy warning
intoverflow Nov 20, 2023
41d88a7
Default Serde value for FileProvider::receipts
intoverflow Nov 21, 2023
4a90227
Disable bloom filter checks
intoverflow Nov 21, 2023
7aa11fd
Clippy
intoverflow Nov 21, 2023
b541602
Clippy
intoverflow Nov 21, 2023
151b4e8
Fix parsing of from and to fields for deposits
intoverflow Nov 21, 2023
782c1ab
Merge branch 'main' of github.com:risc0/zeth into tcarstens/op-derive
intoverflow Nov 22, 2023
394f5ea
Reintroduce filtering by log bloom
intoverflow Nov 22, 2023
13254a9
Merge branch 'main' of github.com:risc0/zeth into tcarstens/op-derive
hashcashier Nov 27, 2023
8516a7d
fmt
hashcashier Nov 27, 2023
76402a3
Add support for local exec to op-derive
intoverflow Nov 27, 2023
a7cc496
Enforce block_number is correct in MemDb
intoverflow Nov 28, 2023
6a5435b
Split derive() into multiple functions
intoverflow Nov 30, 2023
7fbcce1
Remove redundant check for batch parent hash
intoverflow Nov 30, 2023
1e9441e
Remove redundant copy of system config
intoverflow Nov 30, 2023
fc696d2
Remove redundant block number check
intoverflow Nov 30, 2023
d9573ca
Cleanup
intoverflow Nov 30, 2023
a8748f6
Remove redundant vector of eth blocks
intoverflow Nov 30, 2023
65d04d8
Add base_fee_per_gas to Epoch
intoverflow Nov 30, 2023
1591bf1
Store deposits in Epoch
intoverflow Nov 30, 2023
b9a5eb6
Add Eth tail to DeriveOutput
intoverflow Nov 30, 2023
b843875
Cleanup
intoverflow Nov 30, 2023
7ed041f
Move deque_next_epoch_if_none to State
intoverflow Nov 30, 2023
944e6b0
Move eth block processing to Batches
intoverflow Nov 30, 2023
fe1c95e
Pull from main
intoverflow Dec 12, 2023
ab6aa20
update zkvm, basic guest
hashcashier Dec 13, 2023
e38c1f1
more compose guest code, comment bonsai code
hashcashier Dec 13, 2023
f571159
untested composition draft guest code
hashcashier Dec 13, 2023
f24a477
Reorg and cleanup
intoverflow Dec 14, 2023
f25b30e
More cleanup
intoverflow Dec 14, 2023
76c98f6
run cargo fmt --all
Wollac Dec 14, 2023
f633fe0
fix clippy warnings
Wollac Dec 14, 2023
e2badf2
Merge branch 'main' into tcarstens/op-derive
Wollac Dec 14, 2023
a480a14
remove unused imports
Wollac Dec 14, 2023
a33f842
basic prep/left/fin in-memory flow
hashcashier Dec 14, 2023
5540c1e
in memory aggregation workflow
hashcashier Dec 14, 2023
6d7364c
format guest code
Wollac Dec 14, 2023
acd5573
composition with receipts
hashcashier Dec 14, 2023
14ffa70
Merge branch 'tcarstens/op-derive' of github.com:risc0/zeth into rkha…
hashcashier Dec 14, 2023
1538b26
add op-derive cmd test
Wollac Dec 15, 2023
0e08feb
add cmd tests
Wollac Dec 15, 2023
0cbb413
cleanup optimism/mod
Wollac Dec 15, 2023
2b0ada8
Rename command line args
intoverflow Dec 15, 2023
3b166b5
Fix test arguments
intoverflow Dec 15, 2023
bc1ec04
Rename config field to max_channel_bank_size
intoverflow Dec 15, 2023
2ab54b2
Enforce decompression limit of MAX_RLP_BYTES_PER_CHANNEL
intoverflow Dec 15, 2023
2d007dd
Use constant OPTIMISM_DEPOSITED_TX_TYPE when checking batch validity
intoverflow Dec 15, 2023
c81dd60
Import from std instead of alloc/core
intoverflow Dec 15, 2023
2f6a865
Re-enable core::mem::forget() optimization
intoverflow Dec 15, 2023
707b89b
Replace asserts with ensures; enforce absence of receipts for Op blocks
intoverflow Dec 15, 2023
098d82d
Simplfy iteration through derived transactions
intoverflow Dec 15, 2023
dae216a
Add Bonsai support to op-derive. Also add Bonsai session status to ou…
intoverflow Dec 15, 2023
040aa3a
More println
intoverflow Dec 15, 2023
2fd7c89
Rework Batcher initialization
intoverflow Dec 15, 2023
a08b13d
More logging
intoverflow Dec 16, 2023
2b7186a
More log output if Bonsai workflow fails
intoverflow Dec 16, 2023
cb2ddcb
Merge branch 'tcarstens/op-derive' of github.com:risc0/zeth into rkha…
hashcashier Dec 18, 2023
3435c2a
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op-compose
hashcashier Dec 18, 2023
0240472
refactor rpc db
hashcashier Dec 18, 2023
7de2483
variable derive step support
hashcashier Dec 19, 2023
64240f2
re-enable profiling
hashcashier Dec 19, 2023
3b314ab
ignore rpc_cache dir
hashcashier Dec 19, 2023
8595dda
add -profile support to compose binary
hashcashier Dec 19, 2023
facbd33
upgrade zkvm, modify code comments
hashcashier Dec 20, 2023
83e1d8f
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op-compose
hashcashier Dec 20, 2023
7c2470a
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op-compose
hashcashier Jan 8, 2024
93d0e0b
bump zkvm, fix CI
hashcashier Jan 11, 2024
8b036ef
clippies
hashcashier Jan 11, 2024
ce5aac1
fixes and changes
hashcashier Jan 16, 2024
9eb70d9
vs code change
hashcashier Jan 16, 2024
5422ad5
disambiguate merkle ranges and proofs
hashcashier Jan 19, 2024
ecd68ff
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op-compose
hashcashier Jan 23, 2024
4c18859
Merge branch 'main' of github.com:risc0/zeth into rkhalil/op-compose
hashcashier Jan 23, 2024
da933fe
update risc0 to release v0.20
hashcashier Jan 30, 2024
563c5bf
update GH action to 0.20
Wollac Jan 31, 2024
8349be3
use old actions
Wollac Jan 31, 2024
d5efdc1
changes
hashcashier Feb 2, 2024
d2ab2f6
refactor: Unified zeth utility (#72)
hashcashier Feb 5, 2024
9a58965
cleanup toml files
Wollac Feb 5, 2024
573a2a1
remove unused imports
Wollac Feb 5, 2024
1358376
cli cleanup
Wollac Feb 6, 2024
1147152
change block count to u32
Wollac Feb 7, 2024
6bf0eee
test composition
Wollac Feb 7, 2024
90b5ea0
fix arguments
Wollac Feb 7, 2024
4e8640f
update risc0 to 0.20.1
Wollac Feb 7, 2024
90c9fe8
compact json files
Wollac Feb 7, 2024
3fb1f45
update lock files
Wollac Feb 7, 2024
b48f089
test for warnings
Wollac Feb 9, 2024
7f44cb2
nits
hashcashier Feb 12, 2024
3f7905a
docker in readme
hashcashier Feb 12, 2024
1370975
create cache file if not found
Wollac Feb 12, 2024
2d2810a
update copyright
Wollac Feb 12, 2024
9e3d5bf
update copyright
Wollac Feb 12, 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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
env:
CARGO_TERM_COLOR: always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_VERSION: 0.19.1
RISC0_VERSION: 0.20.1
RISC0_TOOLCHAIN_VERSION: test-release-2

concurrency:
Expand All @@ -31,7 +31,7 @@ jobs:
crate: cargo-binstall
- run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }}
- run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
- run: cargo test --workspace --all-targets --all-features
- run: cargo test --workspace --all-targets -F ef-tests,debug-guest-build

clippy:
name: clippy
Expand All @@ -45,7 +45,7 @@ jobs:
with:
reporter: 'github-pr-check'
fail_on_error: true
clippy_flags: --workspace --all-targets --all-features -- -Dwarnings
clippy_flags: --workspace --all-targets -- -Dwarnings

fmt:
name: fmt
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
.DS_Store
target/
tmp/
cache_rpc/
cache_zkp/
log.txt
*.pb
rpc_cache.json
.idea
*.zkp
cache_rpc.json
.idea
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"./Cargo.toml",
"./guests/eth-block/Cargo.toml",
"./guests/op-block/Cargo.toml",
"./guests/op-compose/Cargo.toml",
"./guests/op-derive/Cargo.toml",
"./testing/ef-tests/testguest/Cargo.toml"
]
Expand Down
Loading
Loading