-
Notifications
You must be signed in to change notification settings - Fork 158
Add TipCollectionToggler contract #439
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.
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
Open
TucksonDev
wants to merge
7
commits into
develop
Choose a base branch
from
add-tip-collection-toggler
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3a8230a
Add TipCollectionToggler contract
TucksonDev c348f75
Set expiry timestamp on activation
TucksonDev 8221a04
Add modifier to revoke
TucksonDev a68b06f
Add event for SetCollectTips
TucksonDev 1178d14
Add event for revoke function
TucksonDev d1f9ccf
Update precompiles pin to v60.0.0
TucksonDev 87a9c8d
fix slither
godzillaba File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| // Copyright 2022-2026, Offchain Labs, Inc. | ||
| // For license information, see https://github.com/OffchainLabs/nitro/blob/master/LICENSE.md | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
|
|
||
| pragma solidity ^0.8.0; | ||
|
|
||
| import "../precompiles/ArbOwner.sol"; | ||
| import "@openzeppelin/contracts/access/AccessControlEnumerable.sol"; | ||
|
|
||
| contract TipCollectionToggler is AccessControlEnumerable { | ||
| ArbOwner internal constant ARB_OWNER = ArbOwner(address(0x70)); | ||
| uint256 internal constant ACTIVATION_DURATION = 2 * 365 days; // 2 years | ||
|
|
||
| bytes32 public constant MANAGER_ROLE = keccak256("MANAGER_ROLE"); | ||
| uint256 public expiryTimestamp; | ||
|
|
||
| error NotExpired(); | ||
| error NotActivated(); | ||
| error AlreadyActivated(); | ||
|
|
||
| event Activated(uint256 expiryTimestamp); | ||
| event Revoked(); | ||
| event CollectTipsUpdated(bool collectTips); | ||
|
|
||
| modifier onlyActivated() { | ||
| if (expiryTimestamp == 0) { | ||
| revert NotActivated(); | ||
| } | ||
| _; | ||
| } | ||
|
|
||
| constructor(address admin, address manager) { | ||
| _setupRole(DEFAULT_ADMIN_ROLE, admin); | ||
| _setupRole(MANAGER_ROLE, manager); | ||
| } | ||
|
|
||
| /// @notice Activates the contract for a fixed duration, allowing tip collection to be toggled. | ||
| function activate() external onlyRole(DEFAULT_ADMIN_ROLE) { | ||
| if (expiryTimestamp != 0) { | ||
| revert AlreadyActivated(); | ||
| } | ||
| expiryTimestamp = block.timestamp + ACTIVATION_DURATION; | ||
| emit Activated(expiryTimestamp); | ||
| } | ||
|
|
||
| /// @notice Removes the contract from the list of chain owners after the expiry timestamp | ||
| function revoke() external onlyActivated { | ||
| if (block.timestamp < expiryTimestamp) { | ||
| revert NotExpired(); | ||
| } | ||
| ARB_OWNER.removeChainOwner(address(this)); | ||
|
godzillaba marked this conversation as resolved.
|
||
| emit Revoked(); | ||
| } | ||
|
|
||
| /// @notice Enables or disables tip collection. | ||
| /// @param collectTips If true, transaction tips are collected by the network fee account. If false (default), tips are dropped. | ||
| function setCollectTips( | ||
| bool collectTips | ||
| ) external onlyRole(MANAGER_ROLE) onlyActivated { | ||
| ARB_OWNER.setCollectTips(collectTips); | ||
| emit CollectTipsUpdated(collectTips); | ||
| } | ||
| } | ||
Submodule precompiles
updated
11 files
| +67 −0 | .github/workflows/sbom-export.yaml | |
| +1 −1 | ArbAddressTable.sol | |
| +37 −0 | ArbFilteredTransactionsManager.sol | |
| +28 −0 | ArbGasInfo.sol | |
| +2 −1 | ArbInfo.sol | |
| +45 −0 | ArbMultiGasConstraintsTypes.sol | |
| +113 −0 | ArbOwner.sol | |
| +28 −0 | ArbOwnerPublic.sol | |
| +5 −0 | ArbWasm.sol | |
| +1 −1 | LICENSE.md | |
| +1 −1 | package.json |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.