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 #2046

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

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

wants to merge 130 commits into from
+420 −62

Conversation

lima-limon-inc
Copy link
Contributor

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

Motivation

Currently, users have to write the .env file by hand. The file is in a format that is hard to read and will only get worse if more variables get added to it.

Description

This PR makes it so that users now have to edit a config.toml instead. That file gets converted into the .env file which is used by the L1 and L2.

It also provides a config_example.toml file, just like .env.example before it.

Sidenote: It also changes the Genesis alloc field to a BTreeMap so it's deterministic in between runs.

Closes #1989
Closes #2070

@lima-limon-inc lima-limon-inc added the L2 Rollup client label Feb 20, 2025
@lima-limon-inc lima-limon-inc self-assigned this Feb 20, 2025
@lima-limon-inc lima-limon-inc requested a review from a team as a code owner February 20, 2025 20:31
@lima-limon-inc lima-limon-inc marked this pull request as draft February 20, 2025 20:31
@github-actions GitHub Actions
Copy link

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

| File                                                            | Lines | Diff |
+-----------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/contracts/deployer.rs | 575   | +10  |
+-----------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/errors.rs             | 34    | +34  |
+-----------------------------------------------------------------+-------+------+
| /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/sdk/src/sdk.rs        | 287   | +2   |
+-----------------------------------------------------------------+-------+------+
| /home/runner/work/ethrex/ethrex/crates/l2/utils/config/mod.rs   | 70    | +1   |
+-----------------------------------------------------------------+-------+------+

Total lines added: +307
Total lines removed: 0
Total lines changed: 307

@lima-limon-inc
Set conf.toml path to root
a02f561 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Use PWD instead of hardcoded root path
4801e36 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change back to root
ab0633f 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add PWD to config.toml
85ef7d2 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change ENV file path
2a454e6 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add comment
e4e8d85 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Leave config.toml in root but put .env in /usr/local/bin/
0cbc425 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add root to config.toml in rust code
5e489ce 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
If ENV_FILE is not defined (for whatever reason) use absolute path in…
bb4f5be 
…stead

Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Try new path with open error
d3d0f47 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Fix lint
498cafa 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Copy link
Contributor Author

This commit worked locally: d3d0f47

@lima-limon-inc
Use relative paths when env variable is not defined
6ce93fe 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add file and line number error when opening file
6b84a7d 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Remove useless conversion
ddd7f0d 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change return file to make it clippy style
e0b0d5d 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add toml parsing in test
9c9fc24 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change bridge address
69968b5 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
REVERT LATER: Remove old address
75e9a11 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Add debug to bridge parsing
47c2a6f 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Change bridge_address function to use string of address
bb3b2f2 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Merge branch 'main' into l2/feat/toml
4c5ff45
@lima-limon-inc
Check why tx hash is different
07144cb 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Revert "Remove l2/metrics from cmd/ethrex/Cargo.toml"
44bc075 
This reverts commit 3070988.
@lima-limon-inc
Revert "Use a BtreeMap instead of a hashmap so that it is deterministic"
2977c3a 
This reverts commit c6161b1.

Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Update genesis-l2.json so that it's the same as in main
9cf2e9f 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc lima-limon-inc mentioned this pull request Feb 27, 2025
Draft
@lima-limon-inc
Change bridge address to match main's
f069e63 
Signed-off-by: Tomas Fabrizio Orsi <tomas.orsi@lambdaclass.com>
@lima-limon-inc
Revert "Change bridge_address function to use string of address"
21ff5c8 
This reverts commit bb3b2f2.
@lima-limon-inc
Add root to BRIDGE ADDRESS in l2 makefile
e6592ce 
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
L2 Rollup client
Projects
ethrex_l2
Status: No status
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

L2: Every time the L2 is run, the genesis file gets overwritten L2: Move config to .toml/.yaml files
2 participants
@lima-limon-inc @jrchatruc