Skip to content
Closed
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
cc31505
Reuse EthOptions
ManuelBilbao Aug 6, 2025
00b3ccc
Change some options
ManuelBilbao Aug 6, 2025
65aa47e
Continue improving CLI
ManuelBilbao Aug 7, 2025
210807c
Remove unused file
ManuelBilbao Aug 7, 2025
ed65554
Remove duplicated code
ManuelBilbao Aug 7, 2025
c6c2494
Improve ownership transfers
ManuelBilbao Aug 7, 2025
cd5eddc
Refactor initializer
ManuelBilbao Aug 7, 2025
c1b8d62
Fix genesis requirement
ManuelBilbao Aug 7, 2025
adb2c1b
Remove duplicated function and improve logs
ManuelBilbao Aug 7, 2025
5d579a3
Write .env on request
ManuelBilbao Aug 7, 2025
4884c98
Improve help messages
ManuelBilbao Aug 8, 2025
27d1c1a
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Aug 11, 2025
0ce3db2
Improve deposits
ManuelBilbao Aug 11, 2025
bf80008
Improve default values
ManuelBilbao Aug 11, 2025
9daca1a
Change names
ManuelBilbao Aug 11, 2025
b87a867
Add support for verifiers VK in CLI
ManuelBilbao Aug 11, 2025
e8402a0
Fix env var names in docs, ci and docker
ManuelBilbao Aug 12, 2025
59a6801
Embed VKs in binary
ManuelBilbao Aug 12, 2025
8ffc8d0
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Aug 12, 2025
0b8675c
Typos
ManuelBilbao Aug 12, 2025
50c59c1
lint
ManuelBilbao Aug 12, 2025
a9a4b96
Fix .env path
ManuelBilbao Aug 12, 2025
9c90d63
Add missing placeholders
ManuelBilbao Aug 13, 2025
acfc3a2
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Aug 13, 2025
f1e31cb
Fix start L1 step
ManuelBilbao Aug 13, 2025
e9d67f3
Update Makefile opts
ManuelBilbao Aug 13, 2025
033a4fb
Fix makefile opts
ManuelBilbao Aug 13, 2025
da91451
Change .env path
ManuelBilbao Aug 18, 2025
7603ebf
Fix docker in CI
ManuelBilbao Aug 18, 2025
e78f9a4
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Aug 18, 2025
0b0d13c
fix doc
ManuelBilbao Aug 18, 2025
314f81d
Remove wrong docker compose
ManuelBilbao Aug 18, 2025
fb70af1
Test CI
ManuelBilbao Aug 18, 2025
e3b8345
Use deployer address if not sequencer registry owner
ManuelBilbao Aug 18, 2025
6de24e6
Fix paths
ManuelBilbao Aug 18, 2025
602777d
Check slice length before converting
ManuelBilbao Aug 18, 2025
7c81398
Fix paths
ManuelBilbao Aug 18, 2025
3d0898d
Fix paths
ManuelBilbao Aug 18, 2025
994032f
Add bridge owner to CI
ManuelBilbao Aug 19, 2025
c77a393
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Aug 19, 2025
4dcfa8d
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Aug 19, 2025
15f47ce
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 15, 2025
1d543ca
Fix merge
ManuelBilbao Sep 16, 2025
6aa43b9
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 16, 2025
0fe4e4e
Add VK placeholders to github actions
ManuelBilbao Sep 16, 2025
c75bb97
Update tee cargo lock
ManuelBilbao Sep 16, 2025
1bbc492
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 16, 2025
ffaf42c
Update VK paths
ManuelBilbao Sep 16, 2025
7a20f0f
Deploy TDX without deployer
ManuelBilbao Sep 17, 2025
451b7d9
Refactor SDK's deploy functions
ManuelBilbao Sep 18, 2025
593ad44
Fix CI flow
ManuelBilbao Sep 18, 2025
9d7e35c
Fix address
ManuelBilbao Sep 18, 2025
3274dac
Remove old default value
ManuelBilbao Sep 18, 2025
d4a0dfa
Clippy
ManuelBilbao Sep 18, 2025
73ac106
Error handling
ManuelBilbao Sep 18, 2025
e1b15a7
clippy
ManuelBilbao Sep 18, 2025
c4e3c2d
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 18, 2025
78e7b1c
remove db in CI before test
ManuelBilbao Sep 18, 2025
bd7c08a
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 18, 2025
2ece146
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 22, 2025
25df6c9
Fix main_prover CI
ManuelBilbao Sep 22, 2025
6c8b53a
Merge branch 'main' into improve_l2_deployer
ManuelBilbao Sep 22, 2025
a9df759
Add missing backslash
ManuelBilbao Sep 22, 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
4 changes: 2 additions & 2 deletions .github/workflows/main_prover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
touch cmd/.env
cd crates/l2
CI_ETHREX_WORKDIR=/usr/local/bin \
ETHREX_DEPLOYER_DEPLOY_RICH=true \
ETHREX_DEPLOYER_SP1_DEPLOY_VERIFIER=true \
ETHREX_DEPLOYER_DEPOSIT_PRIVATE_KEYS_FILE_PATH=./fixtures/keys/private_keys_l1.txt \
ETHREX_DEPLOYER_DEPLOY_SP1_VERIFIER=true \
docker compose up --build contract_deployer

- name: Ensure admin permissions in _work
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/pr-main_l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,7 @@ jobs:
touch cmd/.env
cd crates/l2
CI_ETHREX_WORKDIR=/usr/local/bin \
ETHREX_DEPLOYER_DEPLOY_RICH=true \
ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_RISC0_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_DEPOSIT_PRIVATE_KEYS_FILE_PATH=./fixtures/keys/private_keys_l1.txt \
ETHREX_L2_VALIDIUM=${{ matrix.validium }} \
docker compose up contract_deployer

Expand Down Expand Up @@ -214,10 +211,7 @@ jobs:
touch cmd/.env
cd crates/l2
CI_ETHREX_WORKDIR=/usr/local/bin \
ETHREX_DEPLOYER_DEPLOY_RICH=true \
ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_RISC0_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_DEPOSIT_PRIVATE_KEYS_FILE_PATH=./fixtures/keys/private_keys_l1.txt \
ETHREX_DEPLOYER_DEPLOY_BASED_CONTRACTS=true \
COMPILE_CONTRACTS=true \
docker compose up contract_deployer
Expand Down Expand Up @@ -254,7 +248,6 @@ jobs:
cd ../crates/l2

CI_ETHREX_WORKDIR=/usr/local/bin \
ETHREX_COMMITTER_VALIDIUM=false \
ETHREX_WATCHER_BLOCK_DELAY=0 \
ETHREX_BASED=true \
ETHREX_STATE_UPDATER_SEQUENCER_REGISTRY="$SEQUENCER_REGISTRY" \
Expand Down Expand Up @@ -300,10 +293,7 @@ jobs:
touch cmd/.env
cd crates/l2
CI_ETHREX_WORKDIR=/usr/local/bin \
ETHREX_DEPLOYER_DEPLOY_RICH=true \
ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_RISC0_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
ETHREX_DEPLOYER_DEPOSIT_PRIVATE_KEYS_FILE_PATH=./fixtures/keys/private_keys_l1.txt \
COMPILE_CONTRACTS=true \
docker compose up contract_deployer

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-main_l2_tdx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
touch cmd/.env
cd crates/l2
make init-l1-docker;
ETHREX_DEPLOYER_DEPLOY_RICH=true \
ETHREX_DEPLOYER_DEPOSIT_PRIVATE_KEYS_FILE_PATH=./fixtures/keys/private_keys_l1.txt \
ETHREX_DEPLOYER_TDX_DEPLOY_VERIFIER=true \
ETHREX_TDX_DEV_MODE=true \
make deploy-l1
Expand Down
12 changes: 7 additions & 5 deletions cmd/ethrex/l2/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use ethrex_common::{
types::{BYTES_PER_BLOB, BlobsBundle, BlockHeader, batch::Batch, bytes_from_blob},
};
use ethrex_l2_common::{calldata::Value, l1_messages::get_l1_message_hash, state_diff::StateDiff};
use ethrex_l2_rpc::signer::LocalSigner;
use ethrex_l2_sdk::call_contract;
use ethrex_rpc::{
EthClient, clients::beacon::BeaconClient, types::block_identifier::BlockIdentifier,
Expand Down Expand Up @@ -466,13 +467,14 @@ impl Command {

let client = EthClient::new(rpc_url.as_str())?;
if let Some(private_key) = private_key {
let signer = LocalSigner::new(private_key).into();

info!("Pausing OnChainProposer...");
call_contract(&client, &private_key, contract_address, "pause()", vec![])
.await?;
call_contract(&client, &signer, contract_address, "pause()", vec![]).await?;
info!("Doing revert on OnChainProposer...");
call_contract(
&client,
&private_key,
&signer,
contract_address,
"revertBatch(uint256)",
vec![Value::Uint(batch.into())],
Expand Down Expand Up @@ -511,9 +513,9 @@ impl Command {
.await?;

if let Some(private_key) = private_key {
let signer = LocalSigner::new(private_key).into();
info!("Unpausing OnChainProposer...");
call_contract(&client, &private_key, contract_address, "unpause()", vec![])
.await?;
call_contract(&client, &signer, contract_address, "unpause()", vec![]).await?;
}
}
Command::Deploy { options } => {
Expand Down
Loading
Loading