Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
7030ea6
feat: migrate to lambdaworks merkle tree in zkvms
MarcosNicolau May 5, 2025
04d8f78
feat: migrate to lambdaworks merkle tree in proof aggregator
MarcosNicolau May 5, 2025
3bac29f
feat: migrate to lambdaworks merkle tree in sdk
MarcosNicolau May 5, 2025
bb5301d
chore: use lambdaworks commit with default fix
MarcosNicolau May 5, 2025
e02d28b
chore: add .git to lambdaworks crate git url
MarcosNicolau May 5, 2025
d3436ae
chore: update merkle tree operator lib
MarcosNicolau May 5, 2025
aa1e8fb
feat: verify proof inclusion in proof aggregation contract
MarcosNicolau May 5, 2025
cf32783
feat: get merkle path for proof in sdk
MarcosNicolau May 5, 2025
ed4cc71
Merge branch 'refactor/use-lambdaworks-merkle-tree' into feat/verify-…
MarcosNicolau May 5, 2025
0c57aa8
feat: verify aggreted proof on chain sdk
MarcosNicolau May 6, 2025
257baf8
fix: verify proof before calling contract and hash data
MarcosNicolau May 6, 2025
c584c29
refactor: aggregation sdk
MarcosNicolau May 6, 2025
27f77ad
feat: compute proof commitment in contract
MarcosNicolau May 6, 2025
26f053d
feat: adapt sdk to new verifyProofInclusion api
MarcosNicolau May 6, 2025
f3e3e92
chore: document new aggregation function on sdk
MarcosNicolau May 6, 2025
5a28bc8
fix: merkle tree backend in sdk
MarcosNicolau May 7, 2025
002102b
chore: add docs explaining why merkle leaves do not need to be hashed…
MarcosNicolau May 7, 2025
f49f9c1
refactor: remove unwrap in fetch_verified_proofs_events
MarcosNicolau May 7, 2025
1b69227
Merge branch 'refactor/use-lambdaworks-merkle-tree' into feat/verify-…
MarcosNicolau May 7, 2025
671faa5
feat: agg-mode example contract
MarcosNicolau May 8, 2025
2e6cb0e
feat: initial code
MarcosNicolau May 8, 2025
1e65322
feat: risc0, sp1 zkvm programs
MarcosNicolau May 8, 2025
a816bec
chore: project boilerplate
MarcosNicolau May 8, 2025
1ebcd5e
Merge branch 'staging' into feat/verify-agg-proof-on-chain
MarcosNicolau May 9, 2025
7344e01
chore: redeploy anvil contracts for new program ids
MarcosNicolau May 9, 2025
4f2aa2f
feat: sp1 state transition program
MarcosNicolau May 9, 2025
eec7585
Merge branch 'refs/heads/staging' into feat/verify-agg-proof-on-chain
JuArce May 9, 2025
1eb9512
merge
JuArce May 9, 2025
dff0728
feat: share types between programs and send proof to aligned
MarcosNicolau May 9, 2025
051fa3a
fix: contract
MarcosNicolau May 9, 2025
ebc7f84
feat: separate files and save db after zkvm run
MarcosNicolau May 9, 2025
b7f99ff
feat: db initial state
MarcosNicolau May 10, 2025
364d16b
fix: roots mismatch between program and backend
MarcosNicolau May 10, 2025
e66b833
feat: send proof to aligned and wait for agg proof verification event
MarcosNicolau May 12, 2025
9e8eac3
fix: merkle tree construction
MarcosNicolau May 12, 2025
8b6391a
feat: write program vk_hash
MarcosNicolau May 12, 2025
7ed99d7
feat: deploy script for contract
MarcosNicolau May 12, 2025
93df5e1
feat: send state transition transaction
MarcosNicolau May 12, 2025
a28b625
chore: update aggregation mode program ids
MarcosNicolau May 13, 2025
bdb337d
Merge branch 'staging' into feat/verify-agg-proof-on-chain
MarcosNicolau May 13, 2025
ac15ea7
Merge branch 'feat/verify-agg-proof-on-chain' into feat/full-example-…
MarcosNicolau May 13, 2025
dece636
Merge branch 'fix/tree-openzeppelin-compliant' into feat/verify-agg-p…
MarcosNicolau May 13, 2025
735a6e9
Merge branch 'feat/verify-agg-proof-on-chain' into feat/full-example-…
MarcosNicolau May 13, 2025
635d5c9
refactor: config struct, better docs, .env examples
MarcosNicolau May 13, 2025
e2a5d63
chore: gen_env target
MarcosNicolau May 13, 2025
550ff35
Update contracts
MauroToscano May 13, 2025
a7c3547
Update deployment
MauroToscano May 13, 2025
c85ee63
Update deployment
MauroToscano May 13, 2025
6b7b189
refactor: proper errors in StateTransition contract
MarcosNicolau May 13, 2025
8814baf
docs: readme and how to run
MarcosNicolau May 13, 2025
1d6f53d
chore: small typo fixes
MarcosNicolau May 13, 2025
ac2aa51
Merge branch 'fix/tree-openzeppelin-compliant' into feat/verify-agg-p…
MarcosNicolau May 13, 2025
cb5e7f2
feat: loop in start_l2, rename zk module, updated initial state and b…
MarcosNicolau May 14, 2025
8133ea7
chore: remove program ids as it vary between systems
MarcosNicolau May 14, 2025
c70e656
docs: add comment to `hash_new_parent` function
JuArce May 14, 2025
0307422
Merge branch 'refs/heads/staging' into fix/tree-openzeppelin-compliant
JuArce May 14, 2025
bb1e223
fix: update anvil state
JuArce May 14, 2025
fcb581a
Merge branch 'fix/tree-openzeppelin-compliant' into feat/verify-agg-p…
MarcosNicolau May 15, 2025
3c32349
Merge branch 'feat/verify-agg-proof-on-chain' into feat/full-example-…
MarcosNicolau May 15, 2025
7825faa
Merge branch 'refs/heads/staging' into feat/verify-agg-proof-on-chain
JuArce May 16, 2025
4201ff4
update anvil state
JuArce May 16, 2025
a18f50f
Merge
MauroToscano May 16, 2025
5981a77
docs: update import path in sdk
MarcosNicolau May 16, 2025
68e3959
Merge branch 'feat/verify-agg-proof-on-chain' into feat/full-example-…
MarcosNicolau May 16, 2025
050edea
fix: sdk merge
MarcosNicolau May 16, 2025
e16c4b9
refactor: simplified agg_layer sdk api
MarcosNicolau May 19, 2025
4352e3b
refactor: update aligned cli with new agg layer api
MarcosNicolau May 19, 2025
a11d534
Merge branch 'feat/verify-agg-proof-on-chain' into feat/full-example-…
MarcosNicolau May 19, 2025
acf5840
refactor: update aligned agg layer integration to new sdk
MarcosNicolau May 19, 2025
2b11569
chore: address clippy warnings
MarcosNicolau May 19, 2025
6f3561c
chore: fix typo in logs and makefile surpress command output
MarcosNicolau May 19, 2025
e3cc03c
chore: target for ethereum package devnet
MarcosNicolau May 19, 2025
204ee76
chore: fix env fields for local deployment
MarcosNicolau May 19, 2025
26b53f3
refactor: move l2 code to l2.rs
JuArce May 20, 2025
19620cb
fix: env.devnet
JuArce May 20, 2025
4387da8
Merge branch 'refs/heads/staging' into feat/full-example-and-docs-for…
JuArce May 20, 2025
3d456d2
chore: update gitignore
JuArce May 20, 2025
7560d99
Update examples/L2/README.md
MauroToscano May 22, 2025
6b039f3
Update README.md
MauroToscano May 22, 2025
9fd5b85
docs: add how to run in local devnet
MarcosNicolau May 22, 2025
eb34070
docs: provide a default wallet for devnet
MarcosNicolau May 23, 2025
17768dd
chore: fix PRIVATE_KEY_STORE_PATH in devnet env
MarcosNicolau May 23, 2025
430445c
chore: rename folder L2 to l2
MarcosNicolau May 23, 2025
e041c94
rm wallet if gen_devnet_owner_wallet already exists
MauroToscano May 23, 2025
5deddd2
Minor fixes on Makefile
MauroToscano May 23, 2025
3588e09
Simplify readme
MauroToscano May 23, 2025
c59deef
feat: separate proving from verification in two commands
MarcosNicolau May 26, 2025
4574762
chore: update .env files and readme
MarcosNicolau May 27, 2025
9cee781
docs: clearer readme
MarcosNicolau May 27, 2025
b23682c
refactor: clearer names
MarcosNicolau May 27, 2025
a58b5a7
fix fmt readme
MauroToscano May 28, 2025
51b0b64
Add missing steps to deploy locally
MauroToscano May 28, 2025
a1dbc36
Update README.md
MauroToscano May 28, 2025
c8ec124
Update README.md
MauroToscano May 28, 2025
44f4d2f
Update README.md
MauroToscano May 28, 2025
fdd14e4
Update README.md
MauroToscano May 28, 2025
b549b3a
Update README.md
MauroToscano May 28, 2025
ee69c63
chore: fix clean_db target Makefile
MarcosNicolau May 28, 2025
e868e89
docs: readme
MarcosNicolau May 29, 2025
ccc4660
docs: README.md
JuArce May 29, 2025
49e7e2f
docs: README.md
JuArce May 29, 2025
450c5aa
docs: README.md
JuArce May 29, 2025
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ nonce_*.bin

infra/ansible/playbooks/ini/**.ini
infra/ansible/playbooks/files/**.pem

examples/l2/crates/l2/db
examples/l2/crates/l2/zkvm_programs/sp1/elf/sp1_state_transition_program
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@
[submodule "contracts/eigenlayer_contracts/eigenlayer-contracts"]
path = contracts/eigenlayer_contracts/eigenlayer-contracts
url = https://github.com/Layr-Labs/eigenlayer-contracts.git
[submodule "examples/l2/contracts/lib/forge-std"]
path = examples/l2/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
5 changes: 2 additions & 3 deletions batcher/aligned-sdk/src/common/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ use std::fmt::Display;
use std::fmt::Formatter;
use std::str::FromStr;

use ethers::core::k256::ecdsa::SigningKey;
use ethers::signers::Signer;
use ethers::signers::Wallet;
pub use ethers::core::k256::ecdsa::SigningKey;
pub use ethers::signers::{Signer, Wallet};
use ethers::types::transaction::eip712::EIP712Domain;
use ethers::types::transaction::eip712::Eip712;
use ethers::types::transaction::eip712::Eip712Error;
Expand Down
10 changes: 10 additions & 0 deletions examples/l2/.env.devnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# .env example for devnet network
NETWORK=devnet
ETH_RPC_URL=http://localhost:8545
WS_ETH_RPC_URL=ws://localhost:8546
BEACON_CLIENT_URL=http://localhost:58801
# Generate it with `make gen_devnet_owner_wallet`
PRIVATE_KEY_STORE_PATH="../contract-owner.keystore.json" # This is read from cmd/.
PRIVATE_KEY_STORE_PASSWORD="<!w5Y%In94Vw"
# Obtain it with `make deploy_contract`
STATE_TRANSITION_CONTRACT_ADDRESS=<STATE_TRANSITION_CONTRACT_ADDRESS>
8 changes: 8 additions & 0 deletions examples/l2/.env.holesky
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# .env example for holesky network
NETWORK=holesky
ETH_RPC_URL=https://ethereum-holesky-rpc.publicnode.com
WS_ETH_RPC_URL=wss://ethereum-holesky-rpc.publicnode.com
BEACON_CLIENT_URL=<YOUR_BEACON_CLIENT_URL> # This can't be a public one as we need to retrieve blobs and they don't support that method
PRIVATE_KEY_STORE_PATH=<PATH_TO_STATE_TRANSITION_OWNER_KEYSTORE>
PRIVATE_KEY_STORE_PASSWORD=<STATE_TRANSITION_OWNER_KEYSTORE_PASSWORD>
STATE_TRANSITION_CONTRACT_ADDRESS=<STATE_TRANSITION_CONTRACT_ADDRESS>
5 changes: 5 additions & 0 deletions examples/l2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
crates/l2/programs_ids.json
contract-owner.keystore.json
cmd/db
cmd/proof.bin
crates/db
Loading
Loading