Skip to content

feat(L2): add system address refunding to FeeDisburser #358

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
0xth4nh merged 12 commits into from
Jul 14, 2026
Merged

feat(L2): add system address refunding to FeeDisburser #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2749457
feat(L2): add system address refunding to FeeDisburser
0xth4nh Jul 8, 2026
9f84e3f
test(L2): add tests for FeeDisburser system address refunding
0xth4nh Jul 9, 2026
2383107
refactor(L2): simplify FeeDisburser by inlining private helpers
0xth4nh Jul 9, 2026
9589b6f
fix(FeeDisburser): address code review findings from PR #358
0xth4nh Jul 9, 2026
76a1284
chore: forge fmt
0xth4nh Jul 9, 2026
bd5133a
revert: restore L2Genesis and MultisigScript to pre-fmt state
0xth4nh Jul 9, 2026
7d73adf
fix(FeeDisburser): address Jack's review comments
0xth4nh Jul 10, 2026
f2f8e56
fix FeeDisburser mocked bridge test
0xth4nh Jul 10, 2026
566067f
refactor FeeDisburser refund simplifications
0xth4nh Jul 10, 2026
4dca099
restore FeeDisburser storage reentrancy guard
0xth4nh Jul 10, 2026
71a50c5
address FeeDisburser initializer review
0xth4nh Jul 13, 2026
ae73279
address FeeDisburser disbursement nits
0xth4nh Jul 14, 2026
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
199 changes: 199 additions & 0 deletions snapshots/abi/FeeDisburser.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "MAX_SYSTEM_ADDRESS_COUNT",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "WITHDRAWAL_MIN_GAS",
Expand All @@ -65,6 +78,24 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address payable[]",
"name": "systemAddresses_",
"type": "address[]"
},
{
"internalType": "uint256[]",
"name": "targetBalances_",
"type": "uint256[]"
}
],
"name": "initialize",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "lastDisbursementTime",
Expand All @@ -91,6 +122,70 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "proxyAdmin",
"outputs": [
{
"internalType": "contract IProxyAdmin",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "proxyAdminOwner",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "systemAddresses",
"outputs": [
{
"internalType": "address payable",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "targetBalances",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
Expand Down Expand Up @@ -148,12 +243,61 @@
"name": "FeesReceived",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint64",
"name": "version",
"type": "uint64"
}
],
"name": "Initialized",
"type": "event"
},
{
"anonymous": false,
"inputs": [],
"name": "NoFeesCollected",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "systemAddress",
"type": "address"
},
{
"indexed": true,
"internalType": "bool",
"name": "success",
"type": "bool"
},
{
"indexed": false,
"internalType": "uint256",
"name": "balanceNeeded",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "balanceSent",
"type": "uint256"
}
],
"name": "ProcessedFunds",
"type": "event"
},
{
"inputs": [],
"name": "ArrayLengthMismatch",
"type": "error"
},
{
"inputs": [],
"name": "FeeVaultMustWithdrawToFeeDisburser",
Expand All @@ -174,9 +318,64 @@
"name": "IntervalTooLow",
"type": "error"
},
{
"inputs": [],
"name": "InvalidInitialization",
"type": "error"
},
{
"inputs": [],
"name": "NotInitializing",
"type": "error"
},
{
"inputs": [],
"name": "ProxyAdminOwnedBase_NotProxyAdmin",
"type": "error"
},
{
"inputs": [],
"name": "ProxyAdminOwnedBase_NotProxyAdminOrProxyAdminOwner",
"type": "error"
},
{
"inputs": [],
"name": "ProxyAdminOwnedBase_NotProxyAdminOwner",
"type": "error"
},
{
"inputs": [],
"name": "ProxyAdminOwnedBase_NotResolvedDelegateProxy",
"type": "error"
},
{
"inputs": [],
"name": "ProxyAdminOwnedBase_NotSharedProxyAdminOwner",
"type": "error"
},
{
"inputs": [],
"name": "ProxyAdminOwnedBase_ProxyAdminNotFound",
"type": "error"
},
{
"inputs": [],
"name": "ReentrantCall",
"type": "error"
},
{
"inputs": [],
"name": "TooManySystemAddresses",
"type": "error"
},
{
"inputs": [],
"name": "ZeroAddress",
"type": "error"
},
{
"inputs": [],
"name": "ZeroTargetBalance",
"type": "error"
}
]
4 changes: 2 additions & 2 deletions snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"sourceCodeHash": "0xcb329746df0baddd3dc03c6c88da5d6bdc0f0a96d30e6dc78d0891bb1e935032"
},
"src/L2/FeeDisburser.sol:FeeDisburser": {
"initCodeHash": "0x1278027e3756e2989e80c0a7b513e221a5fe0d3dbd9ded108375a29b2c1f3d57",
"sourceCodeHash": "0xac49a0ecf22b8a7bb3ebef830a2d27b19050f9b08941186e8563d5113cf0ce9c"
"initCodeHash": "0xe495e0502ee0ab7a39605c2c3bdb323908a81e7e6fe6f7f2fbcd5943bff04bf0",
"sourceCodeHash": "0x0aebe8fc1030935340fbfab9cd7b86ef94be196377692d180f7df6058b688c17"
},
"src/L2/GasPriceOracle.sol:GasPriceOracle": {
"initCodeHash": "0xf72c23d9c3775afd7b645fde429d09800622d329116feb5ff9829634655123ca",
Expand Down
21 changes: 21 additions & 0 deletions snapshots/storageLayout/FeeDisburser.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,26 @@
"offset": 0,
"slot": "1",
"type": "uint256"
},
{
"bytes": "32",
"label": "_disburseFeesEntered",
"offset": 0,
"slot": "2",
"type": "uint256"
},
{
"bytes": "32",
"label": "systemAddresses",
"offset": 0,
"slot": "3",
"type": "address payable[]"
},
{
"bytes": "32",
"label": "targetBalances",
"offset": 0,
"slot": "4",
"type": "uint256[]"
}
]
Loading
Loading