From eb622ad1b2c0478d46ca9c88fd9d657cae6d66dc Mon Sep 17 00:00:00 2001 From: 0xchin Date: Wed, 22 Oct 2025 11:19:55 -0300 Subject: [PATCH 1/3] fix: shares calculator interface variable naming consistency --- .../interfaces/L2/ISharesCalculator.sol | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/contracts-bedrock/interfaces/L2/ISharesCalculator.sol b/packages/contracts-bedrock/interfaces/L2/ISharesCalculator.sol index b47ce282d4a..f7935f1bb11 100644 --- a/packages/contracts-bedrock/interfaces/L2/ISharesCalculator.sol +++ b/packages/contracts-bedrock/interfaces/L2/ISharesCalculator.sol @@ -16,16 +16,16 @@ interface ISharesCalculator { /// @notice Returns the recipients and amounts for fee distribution. /// @dev Any implementation MUST return ShareInfo where the sum of all amounts equals /// the total revenue (sum of all vault balances) as it will revert otherwise - /// @param _sequencerFeeVaultBalance Balance of the sequencer fee vault. - /// @param _baseFeeVaultBalance Balance of the base fee vault. - /// @param _operatorFeeVaultBalance Balance of the operator fee vault. - /// @param _l1FeeVaultBalance Balance of the L1 fee vault. + /// @param _sequencerFeeRevenue Balance of the sequencer fee vault. + /// @param _baseFeeRevenue Balance of the base fee vault. + /// @param _operatorFeeRevenue Balance of the operator fee vault. + /// @param _l1FeeRevenue Balance of the L1 fee vault. /// @return shareInfo Array of ShareInfo structs containing recipients and amounts. function getRecipientsAndAmounts( - uint256 _sequencerFeeVaultBalance, - uint256 _baseFeeVaultBalance, - uint256 _operatorFeeVaultBalance, - uint256 _l1FeeVaultBalance + uint256 _sequencerFeeRevenue, + uint256 _baseFeeRevenue, + uint256 _operatorFeeRevenue, + uint256 _l1FeeRevenue ) external view From 4cea4155904f3dd357a3e9498e7077581ae7b548 Mon Sep 17 00:00:00 2001 From: 0xchin Date: Wed, 22 Oct 2025 11:20:49 -0300 Subject: [PATCH 2/3] chore: consistency in no virtual receive functions fee splitter --- packages/contracts-bedrock/src/L2/FeeSplitter.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-bedrock/src/L2/FeeSplitter.sol b/packages/contracts-bedrock/src/L2/FeeSplitter.sol index e08c3a53313..65461ccc586 100644 --- a/packages/contracts-bedrock/src/L2/FeeSplitter.sol +++ b/packages/contracts-bedrock/src/L2/FeeSplitter.sol @@ -111,7 +111,7 @@ contract FeeSplitter is ISemver, Initializable { } /// @dev Receives ETH fees withdrawn from L2 FeeVaults. - receive() external payable virtual { + receive() external payable { if (!_isTransientDisbursing()) revert FeeSplitter_ReceiveWindowClosed(); if ( msg.sender != Predeploys.SEQUENCER_FEE_WALLET && msg.sender != Predeploys.BASE_FEE_VAULT From 49e140ee58ff4fcf95c801ccfe1df3492dfecf03 Mon Sep 17 00:00:00 2001 From: 0xchin Date: Wed, 22 Oct 2025 11:25:22 -0300 Subject: [PATCH 3/3] fix: pre-pr --- packages/contracts-bedrock/snapshots/semver-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json index 9025505a750..fb2431c3f9c 100644 --- a/packages/contracts-bedrock/snapshots/semver-lock.json +++ b/packages/contracts-bedrock/snapshots/semver-lock.json @@ -65,7 +65,7 @@ }, "src/L2/FeeSplitter.sol:FeeSplitter": { "initCodeHash": "0x6426953a0a4e92722d5dd264f6b23069353ed84ada2462a36104cd73392e6a8c", - "sourceCodeHash": "0x09d876fcd1f7ea31627dae9a78b3c446d745ef67f0fb2b1feea6559e65875a58" + "sourceCodeHash": "0x55a0acbf89e13ce3b1ea74395a1efe123817f843049127bc57f91985a6664718" }, "src/L2/GasPriceOracle.sol:GasPriceOracle": { "initCodeHash": "0x38ef70b2783dd45ad807afcf57972c7df4abaaeb5d16d17cdb451b9e931a9cbb",