vacp2p/linea-monorepo
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-monorepo.git synced 2026-01-09 04:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Chore] Tweak contracts post Aderyn run (#1062)

Browse Source 
* remove variable shadowing

* remove unused errors
This commit is contained in:
The Dark Jester
2025-05-28 15:39:53 +01:00
committed by GitHub
parent 9bc1e42c03
commit b5cdaf5300
4 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/src/bridging/token/interfaces/ITokenBridge.sol
View File

@@ -156,11 +156,6 @@ interface ITokenBridge {
*/
error ReservedToken(address token);
/**
* @dev Thrown when the remote token bridge is already set.
*/
error RemoteTokenBridgeAlreadySet(address remoteTokenBridge);
/**
* @dev Thrown when attempting to reserve an already bridged token.
*/

5
contracts/src/interfaces/IGenericErrors.sol
View File

@@ -16,9 +16,4 @@ interface IGenericErrors {
* @dev Thrown when a parameter is the zero hash.
*/
error ZeroHashNotAllowed();
/**
* @dev Thrown when array lengths are mismatched.
*/
error ArrayLengthsDoNotMatch();
}

20
contracts/src/messaging/l2/L2MessageService.sol
View File

@@ -30,23 +30,23 @@ contract L2MessageService is AccessControlUpgradeable, L2MessageServiceV1, L2Mes
* @param _rateLimitAmount The limit allowed for withdrawing the period.
* @param _defaultAdmin The account to be given DEFAULT_ADMIN_ROLE on initialization.
* @param _roleAddresses The list of addresses to grant roles to.
* @param _pauseTypeRoles The list of pause type roles.
* @param _unpauseTypeRoles The list of unpause type roles.
* @param _pauseTypeRoleAssignments The list of pause type roles.
* @param _unpauseTypeRoleAssignments The list of unpause type roles.
*/
function initialize(
uint256 _rateLimitPeriod,
uint256 _rateLimitAmount,
address _defaultAdmin,
RoleAddress[] calldata _roleAddresses,
PauseTypeRole[] calldata _pauseTypeRoles,
PauseTypeRole[] calldata _unpauseTypeRoles
PauseTypeRole[] calldata _pauseTypeRoleAssignments,
PauseTypeRole[] calldata _unpauseTypeRoleAssignments
) external initializer {
__ERC165_init();
__Context_init();
__AccessControl_init();
__RateLimiter_init(_rateLimitPeriod, _rateLimitAmount);
__PauseManager_init(_pauseTypeRoles, _unpauseTypeRoles);
__PauseManager_init(_pauseTypeRoleAssignments, _unpauseTypeRoleAssignments);
__ReentrancyGuard_init();
if (_defaultAdmin == address(0)) {
@@ -71,15 +71,15 @@ contract L2MessageService is AccessControlUpgradeable, L2MessageServiceV1, L2Mes
* @notice Sets permissions for a list of addresses and their roles as well as initialises the PauseManager pauseType:role mappings.
* @dev This function is a reinitializer and can only be called once per version. Should be called using an upgradeAndCall transaction to the ProxyAdmin.
* @param _roleAddresses The list of addresses and roles to assign permissions to.
* @param _pauseTypeRoles The list of pause types to associate with roles.
* @param _unpauseTypeRoles The list of unpause types to associate with roles.
* @param _pauseTypeRoleAssignments The list of pause types to associate with roles.
* @param _unpauseTypeRoleAssignments The list of unpause types to associate with roles.
*/
function reinitializePauseTypesAndPermissions(
RoleAddress[] calldata _roleAddresses,
PauseTypeRole[] calldata _pauseTypeRoles,
PauseTypeRole[] calldata _unpauseTypeRoles
PauseTypeRole[] calldata _pauseTypeRoleAssignments,
PauseTypeRole[] calldata _unpauseTypeRoleAssignments
) external reinitializer(2) {
__Permissions_init(_roleAddresses);
__PauseManager_init(_pauseTypeRoles, _unpauseTypeRoles);
__PauseManager_init(_pauseTypeRoleAssignments, _unpauseTypeRoleAssignments);
}
}

10
contracts/src/rollup/LineaRollup.sol
View File

@@ -143,18 +143,18 @@ contract LineaRollup is AccessControlUpgradeable, ZkEvmV2, L1MessageService, Per
* @notice Sets permissions for a list of addresses and their roles as well as initialises the PauseManager pauseType:role mappings and fallback operator.
* @dev This function is a reinitializer and can only be called once per version. Should be called using an upgradeAndCall transaction to the ProxyAdmin.
* @param _roleAddresses The list of addresses and roles to assign permissions to.
* @param _pauseTypeRoles The list of pause types to associate with roles.
* @param _unpauseTypeRoles The list of unpause types to associate with roles.
* @param _pauseTypeRoleAssignments The list of pause types to associate with roles.
* @param _unpauseTypeRoleAssignments The list of unpause types to associate with roles.
* @param _fallbackOperator The address of the fallback operator.
*/
function reinitializeLineaRollupV6(
RoleAddress[] calldata _roleAddresses,
PauseTypeRole[] calldata _pauseTypeRoles,
PauseTypeRole[] calldata _unpauseTypeRoles,
PauseTypeRole[] calldata _pauseTypeRoleAssignments,
PauseTypeRole[] calldata _unpauseTypeRoleAssignments,
address _fallbackOperator
) external reinitializer(6) {
__Permissions_init(_roleAddresses);
__PauseManager_init(_pauseTypeRoles, _unpauseTypeRoles);
__PauseManager_init(_pauseTypeRoleAssignments, _unpauseTypeRoleAssignments);
if (_fallbackOperator == address(0)) {
revert ZeroAddressNotAllowed();