feat(l2): revert current native token feature #5008
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit f6ccc00.
Lines of code reportTotal lines added: Detailed view |
tomip01
commented
Oct 23, 2025
Comment on lines
90
to
93
| /// @notice The L1 token address that is treated as the one to be bridged to the L2. | ||
| /// @dev If set to address(0), ETH is considered the native token. | ||
| /// Otherwise, this address is used for native token deposits and withdrawals. | ||
| address public NATIVE_TOKEN_L1; |
Contributor
Author
There was a problem hiding this comment.
do we deprecate this var?
Contributor
There was a problem hiding this comment.
I think we can safely this as we didn't deploy any L2 since this was added
tomip01
changed the title
tomip01
requested review from
a team,
ManuelBilbao and
jrchatruc
as code owners
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR reverts the native token approach for L2, returning to ETH as the native balance while preparing for a future feature to allow fee payment with ERC20 tokens. The change simplifies the bridge implementation by removing the configurable native token support and standardizing on ETH.
Key changes:
- Removed native token configuration and related logic throughout the codebase
- Updated bridge contracts to use
ETH_TOKENconstant instead of configurableNATIVE_TOKEN_L1 - Simplified deposit/withdrawal flows to only handle ETH transfers
- Updated tests to remove native token conditionals
Reviewed Changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| fixtures/contracts/ERC20/NativeTokenTest.bin | Removed test ERC20 token contract binary |
| docs/l2/fundamentals/native_tokens.md | Removed native token documentation |
| docs/l2/fundamentals/contracts.md | Updated constant name from NATIVE_TOKEN_L2 to ETH_TOKEN |
| crates/l2/tests/tests.rs | Removed native token parameters and conditional logic from test functions |
| crates/l2/sdk/src/sdk.rs | Updated default bridge address |
| crates/l2/docker-compose.yaml | Removed native token environment variable |
| crates/l2/contracts/src/l2/CommonBridgeL2.sol | Renamed constant and simplified withdrawal encoding |
| crates/l2/contracts/src/l1/interfaces/ICommonBridge.sol | Removed _amount parameter from deposit function signature |
| crates/l2/contracts/src/l1/CommonBridge.sol | Removed native token logic, simplified deposit/withdrawal to ETH-only |
| cmd/ethrex/l2/deployer.rs | Removed native token configuration and ERC20 approval logic from deployer |
| .github/workflows/pr-main_l2.yaml | Removed native token test workflow configuration |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
210
to
213
| _deposit(l2Recipient); | ||
| } | ||
|
|
||
| function _deposit(address l2Recipient) private { |
Contributor
There was a problem hiding this comment.
We can now have _deposit body directly in deposit and call deposit() on receive()
Comment on lines
90
to
93
| /// @notice The L1 token address that is treated as the one to be bridged to the L2. | ||
| /// @dev If set to address(0), ETH is considered the native token. | ||
| /// Otherwise, this address is used for native token deposits and withdrawals. | ||
| address public NATIVE_TOKEN_L1; |
Contributor
There was a problem hiding this comment.
I think we can safely this as we didn't deploy any L2 since this was added
ilitteri
approved these changes
Nov 10, 2025
ManuelBilbao
approved these changes
Nov 11, 2025
Co-authored-by: Manuel Iñaki Bilbao <[email protected]>
ilitteri
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note
#5024 re-introduces the feature with a different approach
Motivation
We want a new approach for having native tokens in the L2. We want to keep the balance of the accounts to remain being ETH but allow the fees of the transactions to be paid with an ERC20.
Description