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.

Sign up for GitHub

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

Jump to bottom

feat(l2): change config from .env to config.toml #2100

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft

feat(l2): change config from .env to config.toml #2100

wants to merge 30 commits into from
+4,317 −95

Conversation

lima-limon-inc
Copy link
Contributor

@lima-limon-inc lima-limon-inc commented Feb 27, 2025 •
edited
Loading

Motivation

(This is a clone of #2046 to check where the error is. I am reconstructing the PR piece by piece to find the bug.)

Description

Closes #issue_number

@lima-limon-inc
Check values
eb0acc4 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 27, 2025 •
edited
Loading 

| File                                                                           | Lines | Diff |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/cmd/ethrex/ethrex.rs                           | 430   | -3   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/blockchain/blockchain.rs                | 280   | -90  |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/blockchain/mempool.rs                   | 505   | -66  |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/blockchain/payload.rs                   | 569   | +17  |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/contracts/deployer.rs                | 574   | +9   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/errors.rs                            | 33    | +33  |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/l2.rs                                | 5     | +2   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/parse_toml.rs                        | 258   | +258 |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/proposer/l1_watcher.rs               | 241   | -4   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/proposer/mod.rs                      | 99    | -4   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/utils/config/mod.rs                  | 72    | +3   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/p2p/discv4/server.rs         | 677   | -3   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/p2p/network.rs               | 169   | -4   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/p2p/rlpx/connection.rs       | 501   | -4   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/p2p/rlpx/eth/transactions.rs | 297   | -9   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/p2p/rlpx/handshake.rs        | 422   | -2   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/engine/fork_choice.rs    | 357   | -2   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/eth/account.rs           | 222   | +1   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/eth/filter.rs            | 572   | -12  |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/eth/gas_price.rs         | 129   | -4   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/eth/max_priority_fee.rs  | 114   | -4   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/rpc.rs                   | 622   | -13  |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/networking/rpc/utils.rs                 | 289   | -3   |
+--------------------------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/storage/store.rs                        | 1269  | +153 |
+--------------------------------------------------------------------------------+-------+------+

Total lines added: +476
Total lines removed: 227
Total lines changed: 703

@lima-limon-inc
Replace .env.example with config_example.toml
831f911 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add config.toml to .gitignore
3db8400 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add toml to crates/l2/Cargo.lock
48eebaa 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add toml.parsing
a9168c6 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add .env.example AND config_example.toml. Have both of them
46d238f 
This reverts commit 831f911.

Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add conf.toml parsing in deployer.rs and test.rs
f385074 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc lima-limon-inc changed the title Check values feat(l2): change config from .env to config.toml Feb 27, 2025
@lima-limon-inc lima-limon-inc self-assigned this Feb 27, 2025
@lima-limon-inc lima-limon-inc force-pushed the l2/test_ci branch 2 times, most recently from 37246ad to 2731b49 Compare February 27, 2025 19:18
lima-limon-inc and others added 3 commits February 27, 2025 16:19
@lima-limon-inc @jrchatruc
Revert "Add conf.toml parsing in deployer.rs and test.rs"
0f6eb0f 
This reverts commit f385074.

Co-authored-by: Javier Rodríguez Chatruc <49622509+jrchatruc@users.noreply.github.com>
@lima-limon-inc
Add conf.toml to the docker_compose-l2.yaml and ci_l2.yaml
e92e795 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@xqft @lima-limon-inc
remove alloy dep from vm
821d740 
temporarily remove rust cache

Revert "temporarily remove rust cache"

This reverts commit 429fb06.

Add cargo.lock

revert main cargo.lock
@lima-limon-inc
Add dbg to DEPLOYER_SALT_IS_ZERO, eth_client, proposer_client and env…
d84c8a4 
…::vars

Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Save rich_wallet_address to variable instead of calling the l1_rich_w…
b4b2da0 
…allet_address multiple times

Done to simplify debugging

Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
lima-limon-inc and others added 11 commits February 27, 2025 17:46
@lima-limon-inc
Set the bridge address to the one generated in write_env()
e44b2dd 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@JereSalo @lima-limon-inc
remove sp1 version and pin to 4.1.0
98050c6 
pin sp1 version to 4.1.0
@lima-limon-inc
Add debug to line
60eac79 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add debug statement when entering deployer
c584734 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Revert "Set the bridge address to the one generated in write_env()"
a305d34 
This reverts commit e44b2dd.
@lima-limon-inc
Add dbg to key value
7671ff7 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add a backtrace when write_env is called
f0fbb3c 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add dbg to env variables before reading .env file
11e659d 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
REVERT LATER: Fix linter error
997e31d 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add toml parsing to deployer and also grep toml instead of .env
ed07e30 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Don't use .env.example. USe .env as a way to share information betwee…
954680b 
…n docker and main process

Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add a touch .env to the makefile so that the .env file already exists
c306c0d 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change path to .env file in docker compose
25b16e9 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Remove backtrace
4750528 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Makefile<l2>: /config.toml -> config.toml
a6d1cf1 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change BRIDGE_ADDRESS to L1_WATCHER_BRIDGE_ADDRESS
d084650 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change ON_CHAIN_PROPOSER_ADDRESS to COMMITTER_ON_CHAIN_PROPOSER
07b671e 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Move touch .env up in makefile
2a92ad3 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lima-limon-inc lima-limon-inc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lima-limon-inc @xqft @JereSalo