Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bdd554f
feat: update fee vaults
funkornaut001 Aug 8, 2025
200ea58
Update packages/contracts-bedrock/src/L2/OperatorFeeVault.sol
funkornaut001 Aug 13, 2025
32e0798
Update packages/contracts-bedrock/src/L2/L1FeeVault.sol
funkornaut001 Aug 13, 2025
508c2ad
Update packages/contracts-bedrock/src/legacy/FeeVaultInitializer.sol
funkornaut001 Aug 13, 2025
ee6ef13
Update packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
funkornaut001 Aug 13, 2025
e1b5a4f
Update packages/contracts-bedrock/src/L2/BaseFeeVault.sol
funkornaut001 Aug 13, 2025
b5b8668
feat: add events
funkornaut001 Aug 15, 2025
03350e3
feat: immutable and state vars with proper view and setter functions
funkornaut001 Aug 19, 2025
cccee26
feat: update vaults remove initializers
funkornaut001 Aug 19, 2025
c965793
feat: enforce withdraw network to be l2 if recipient if fee splitter
funkornaut001 Aug 19, 2025
2e77763
feat: vault initializer contract only deploys new fee vaults
funkornaut001 Aug 20, 2025
440f10a
feat: add in try catch blocks to support old fee vault implementations
funkornaut001 Aug 20, 2025
cc2d8b7
feat: revert constructor changes
funkornaut001 Aug 26, 2025
999c8ea
feat: remove proxy admin owned base contract use
funkornaut001 Aug 26, 2025
9578202
feat: simplify with internal function and singular event
funkornaut001 Aug 26, 2025
930dc0f
Merge branch 'poc/vault-fee-splitter' into poc/fee-vault-migrator
funkornaut001 Aug 26, 2025
c892391
fix: bump versions
funkornaut001 Aug 27, 2025
c2559e2
fix: remove initializer
funkornaut001 Aug 27, 2025
951c2a7
fix: revert to old constructor
funkornaut001 Aug 27, 2025
788538b
fix: remove current implementation from event and return value
funkornaut001 Aug 27, 2025
5e1a24e
Merge branch 'poc/vault-fee-splitter' into poc/fee-vault-migrator
funkornaut001 Aug 27, 2025
ea62e5b
chore: remove unused imports
funkornaut001 Aug 27, 2025
c556429
fix: gap of 44
funkornaut001 Aug 27, 2025
ac51ebd
chore: pre pr checks
funkornaut001 Aug 27, 2025
0bd2b64
Merge branch 'poc/vault-fee-splitter' into poc/fee-vault-migrator
funkornaut001 Aug 28, 2025
ffacbc0
fix: __gap to 46
funkornaut001 Aug 28, 2025
2eb23ed
Merge branch 'poc/vault-fee-splitter' into poc/fee-vault-migrator
funkornaut001 Aug 28, 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
14 changes: 11 additions & 3 deletions packages/contracts-bedrock/interfaces/L2/IFeeVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,27 @@ pragma solidity ^0.8.0;
import { Types } from "src/libraries/Types.sol";

interface IFeeVault {
error FeeSplitter_OnlyProxyAdminOwner();

event Withdrawal(uint256 value, address to, address from);
event Withdrawal(uint256 value, address to, address from, Types.WithdrawalNetwork withdrawalNetwork);
event MinWithdrawalAmountUpdated(uint256 oldWithdrawalAmount, uint256 newWithdrawalAmount);
event RecipientUpdated(address oldRecipient, address newRecipient);
event WithdrawalNetworkUpdated(Types.WithdrawalNetwork oldWithdrawalNetwork, Types.WithdrawalNetwork newWithdrawalNetwork);

receive() external payable;

function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
function RECIPIENT() external view returns (address);
function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
function minWithdrawalAmount() external view returns (uint256 amount_);
function recipient() external view returns (address recipient_);
function minWithdrawalAmount() external view returns (uint256);
function recipient() external view returns (address);
function totalProcessed() external view returns (uint256);
function withdraw() external;
function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
function withdrawalNetwork() external view returns (Types.WithdrawalNetwork);
function setMinWithdrawalAmount(uint256 _newMinWithdrawalAmount) external;
function setRecipient(address _newRecipient) external;
function setWithdrawalNetwork(Types.WithdrawalNetwork _newWithdrawalNetwork) external;

function __constructor__() external;
}
22 changes: 22 additions & 0 deletions packages/contracts-bedrock/interfaces/L2/IFeeVaultInitializer.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import { Types } from "src/libraries/Types.sol";

interface IFeeVaultInitializer {
/// @notice Emitted when a fee vault implementation is deployed.
/// @param vaultType The type of fee vault being deployed.
/// @param newImplementation The deployed implementation address.
/// @param recipient The recipient address for the implementation.
/// @param network The withdrawal network for the implementation.
/// @param minWithdrawalAmount The minimum withdrawal amount for the implementation.
event FeeVaultDeployed(
string indexed vaultType,
address indexed newImplementation,
address recipient,
Types.WithdrawalNetwork network,
uint256 minWithdrawalAmount
);

function version() external view returns (string memory);
}
3 changes: 1 addition & 2 deletions packages/contracts-bedrock/scripts/L2Genesis.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -587,8 +587,7 @@ contract L2Genesis is Script {

// Initialize the proxy with the actual values
IFeeSplitter(payable(Predeploys.FEE_SPLITTER)).initialize(
ISharesCalculator(_input.feeSplitterSharesCalculator),
uint128(_input.feeSplitterFeeDisbursementInterval)
ISharesCalculator(_input.feeSplitterSharesCalculator), uint128(_input.feeSplitterFeeDisbursementInterval)
);
}

Expand Down
107 changes: 104 additions & 3 deletions packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"outputs": [
{
"internalType": "uint256",
"name": "amount_",
"name": "",
"type": "uint256"
}
],
Expand All @@ -82,13 +82,52 @@
"outputs": [
{
"internalType": "address",
"name": "recipient_",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_newMinWithdrawalAmount",
"type": "uint256"
}
],
"name": "setMinWithdrawalAmount",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_newRecipient",
"type": "address"
}
],
"name": "setRecipient",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "enum Types.WithdrawalNetwork",
"name": "_newWithdrawalNetwork",
"type": "uint8"
}
],
"name": "setWithdrawalNetwork",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "totalProcessed",
Expand Down Expand Up @@ -128,13 +167,51 @@
"outputs": [
{
"internalType": "enum Types.WithdrawalNetwork",
"name": "network_",
"name": "",
"type": "uint8"
}
],
"stateMutability": "view",
"type": "function"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "oldWithdrawalAmount",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "newWithdrawalAmount",
"type": "uint256"
}
],
"name": "MinWithdrawalAmountUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "oldRecipient",
"type": "address"
},
{
"indexed": false,
"internalType": "address",
"name": "newRecipient",
"type": "address"
}
],
"name": "RecipientUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -190,5 +267,29 @@
],
"name": "Withdrawal",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "enum Types.WithdrawalNetwork",
"name": "oldWithdrawalNetwork",
"type": "uint8"
},
{
"indexed": false,
"internalType": "enum Types.WithdrawalNetwork",
"name": "newWithdrawalNetwork",
"type": "uint8"
}
],
"name": "WithdrawalNetworkUpdated",
"type": "event"
},
{
"inputs": [],
"name": "FeeSplitter_OnlyProxyAdminOwner",
"type": "error"
}
]
Loading