Skip to content

chore: update fees depositor address and min withdrawal amount on genesis #18490

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

Merged
JosepBove merged 5 commits into from
Dec 5, 2025
Merged

chore: update fees depositor address and min withdrawal amount on genesis #18490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2640620
fix: remove todo and update fees depositor address on mainnet (#704)
0xDiscotech Dec 3, 2025
bcb32a5
Merge branch 'develop' into chore/sync-todo-pr
0xDiscotech Dec 3, 2025
7b655d4
Merge pull request #722 from defi-wonderland/chore/sync-todo-pr
0xDiscotech Dec 3, 2025
a06debe
chore: set genesis min withdrawal threshold from ten to two eth (#723)
0xDiscotech Dec 3, 2025
f700319
fix: remove unused errors (#726)
0xDiscotech Dec 4, 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: 1 addition & 2 deletions op-deployer/pkg/deployer/standard/standard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ const (
CurrentTag = ContractsV410Tag
)

// TODO(#17505): This address should be updated to the actual address once deployed
var L1FeesDepositor = common.HexToAddress("0x81c01427DFA9A2512b4EBf1462868856BA4aA91a")
var L1FeesDepositor = common.HexToAddress("0xed9B99a703BaD32AC96FDdc313c0652e379251Fd")
Comment thread
maurelian marked this conversation as resolved.

var DisputeAbsolutePrestate = common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c")

Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/scripts/L2Genesis.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ contract L2Genesis is Script {
uint256 internal constant PRECOMPILE_COUNT = 256;

uint80 internal constant DEV_ACCOUNT_FUND_AMT = 10_000 ether;
uint32 internal constant WITHDRAWAL_MIN_GAS_LIMIT = 1_000_000;
uint256 internal constant MIN_WITHDRAWAL_AMOUNT_THRESHOLD = 10 ether;
uint32 internal constant WITHDRAWAL_MIN_GAS_LIMIT = 800_000;
uint256 internal constant MIN_WITHDRAWAL_AMOUNT_THRESHOLD = 2 ether;

/// @notice Default Anvil dev accounts. Only funded if `cfg.fundDevAccounts == true`.
/// Also known as "test test test test test test test test test test test junk" mnemonic accounts,
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/test/L2/L1Withdrawer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ contract L1Withdrawer_TestInit is CommonTest {
event WithdrawalGasLimitUpdated(uint32 oldWithdrawalGasLimit, uint32 newWithdrawalGasLimit);

// Test state
uint256 minWithdrawalAmount = 10 ether;
uint32 withdrawalGasLimit = 1_000_000;
uint256 minWithdrawalAmount = 2 ether;
uint32 withdrawalGasLimit = 800_000;

uint32 internal constant MIN_WITHDRAWAL_GAS_LIMIT = 800_000;

Expand Down
35 changes: 3 additions & 32 deletions packages/contracts-bedrock/test/L2/RevenueSharingIntegration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ pragma solidity 0.8.15;
import { CommonTest } from "test/setup/CommonTest.sol";
import { ISharesCalculator } from "interfaces/L2/ISharesCalculator.sol";
import { ISuperchainRevSharesCalculator } from "interfaces/L2/ISuperchainRevSharesCalculator.sol";
import { IFeeVault } from "interfaces/L2/IFeeVault.sol";
import { Predeploys } from "src/libraries/Predeploys.sol";
import { Types } from "src/libraries/Types.sol";
import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";

/// @title RevenueSharingIntegration_Test
Expand All @@ -32,31 +30,6 @@ contract RevenueSharingIntegration_Test is CommonTest {
disbursementInterval = feeSplitter.feeDisbursementInterval();
}

/// @notice Configure all vaults to withdraw to FeeSplitter on L2
function _configureVaultsForFeeSplitter() private {
// Get the ProxyAdmin owner to configure vaults
address proxyAdminOwner = proxyAdmin.owner();

// Configure all vaults to withdraw to FeeSplitter on L2
vm.startPrank(proxyAdminOwner);
IFeeVault(payable(address(sequencerFeeVault))).setRecipient(address(feeSplitter));
IFeeVault(payable(address(sequencerFeeVault))).setWithdrawalNetwork(Types.WithdrawalNetwork.L2);
IFeeVault(payable(address(sequencerFeeVault))).setMinWithdrawalAmount(0);

IFeeVault(payable(address(baseFeeVault))).setRecipient(address(feeSplitter));
IFeeVault(payable(address(baseFeeVault))).setWithdrawalNetwork(Types.WithdrawalNetwork.L2);
IFeeVault(payable(address(baseFeeVault))).setMinWithdrawalAmount(0);

IFeeVault(payable(address(l1FeeVault))).setRecipient(address(feeSplitter));
IFeeVault(payable(address(l1FeeVault))).setWithdrawalNetwork(Types.WithdrawalNetwork.L2);
IFeeVault(payable(address(l1FeeVault))).setMinWithdrawalAmount(0);

IFeeVault(payable(address(operatorFeeVault))).setRecipient(address(feeSplitter));
IFeeVault(payable(address(operatorFeeVault))).setWithdrawalNetwork(Types.WithdrawalNetwork.L2);
IFeeVault(payable(address(operatorFeeVault))).setMinWithdrawalAmount(0);
vm.stopPrank();
}
Comment thread
maurelian marked this conversation as resolved.

/// @notice Helper to fund vaults
function _fundVaults(uint256 _sequencerFees, uint256 _baseFees, uint256 _l1Fees, uint256 _operatorFees) private {
vm.deal(address(sequencerFeeVault), _sequencerFees);
Expand Down Expand Up @@ -134,8 +107,9 @@ contract RevenueSharingIntegration_Test is CommonTest {
// | 0/0/0/0 | 2.5 | 205.55 | Accumulating |
// |__________________|______________|______________|________________________________|
function test_revenueSharing_fullFlow_succeeds() public {
// Configure vaults to withdraw to FeeSplitter
_configureVaultsForFeeSplitter();
// Use 10 ETH as the minimum withdrawal amount for this test's hardcoded math
vm.prank(proxyAdminOwner);
l1Withdrawer.setMinWithdrawalAmount(10 ether);
Comment thread
maurelian marked this conversation as resolved.

// Get recipient addresses
address shareRecipient = superchainRevSharesCalculator.shareRecipient();
Expand Down Expand Up @@ -272,9 +246,6 @@ contract RevenueSharingIntegration_Test is CommonTest {
return;
}

// Configure vaults for disbursement
_configureVaultsForFeeSplitter();

{
// Get share info from calculator first
ISharesCalculator.ShareInfo[] memory shareInfo =
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/test/scripts/L2Genesis.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ abstract contract L2Genesis_TestInit is Test {

// Check the L1Withdrawer is properly set
IL1Withdrawer l1Withdrawer = IL1Withdrawer(superchainRevSharesCalculator.shareRecipient());
assertEq(l1Withdrawer.minWithdrawalAmount(), 10 ether);
assertEq(l1Withdrawer.minWithdrawalAmount(), 2 ether);
assertEq(l1Withdrawer.recipient(), input.l1FeesDepositor);
assertEq(l1Withdrawer.withdrawalGasLimit(), 1_000_000);
assertEq(l1Withdrawer.withdrawalGasLimit(), 800_000);
}

function testCGT() internal view {
Expand Down