Merge remote-tracking branch 'origin/celo-contracts/v3.0.0--1' into Kourin1996/celo-rebase-13-contracts-devnet

Kourin1996 · Kourin1996 · commit 0058e4a73e80 · 2025-07-11T18:22:08.000+09:00
diff --git a/packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol b/packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol
@@ -9,7 +9,6 @@ import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IOptimismPortal2 {
-    error CustomGasTokenNotSupported();
     error AlreadyFinalized();
     error BadTarget();
     error Blacklisted();
diff --git a/packages/contracts-bedrock/interfaces/L1/IOptimismPortalInterop.sol b/packages/contracts-bedrock/interfaces/L1/IOptimismPortalInterop.sol
@@ -10,7 +10,6 @@ import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 interface IOptimismPortalInterop {
-    error CustomGasTokenNotSupported();
     error AlreadyFinalized();
     error BadTarget();
     error Blacklisted();
diff --git a/packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol b/packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol
@@ -5,8 +5,6 @@ import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 /// @notice This interface corresponds to the Custom Gas Token version of the SystemConfig contract.
 interface ISystemConfig {
-    error CustomGasTokenNotSupported();
-
     enum UpdateType {
         BATCHER,
         FEE_SCALARS,
diff --git a/packages/contracts-bedrock/interfaces/L1/ISystemConfigInterop.sol b/packages/contracts-bedrock/interfaces/L1/ISystemConfigInterop.sol
@@ -5,8 +5,6 @@ import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 interface ISystemConfigInterop {
-    error CustomGasTokenNotSupported();
-
     event ConfigUpdate(uint256 indexed version, ISystemConfig.UpdateType indexed updateType, bytes data);
     event Initialized(uint8 version);
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -312,6 +312,7 @@ contract Deploy is Deployer {
         artifacts.save("MipsSingleton", address(dio.mipsSingleton()));
         artifacts.save("OPContractsManager", address(dio.opcm()));
         artifacts.save("DelayedWETHImpl", address(dio.delayedWETHImpl()));
+        artifacts.save("SystemConfigImpl", address(dio.systemConfigImpl()));
 
         // Get a contract set from the implementation addresses which were just deployed.
         Types.ContractSet memory impls = Types.ContractSet({
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
@@ -48,9 +48,6 @@ import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol"
 import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
 import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
-/// @notice This is temporary. Error thrown when a chain uses a custom gas token.
-error CustomGasTokenNotSupported();
-
 /// @custom:proxied true
 /// @title OptimismPortal2
 /// @notice The OptimismPortal is a low-level contract responsible for passing messages between L1
@@ -240,9 +237,6 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
         if (token == Constants.ETHER) {
             return address(this).balance;
         } else {
-            // Temporary revert till we support custom gas tokens
-            if (true) revert CustomGasTokenNotSupported();
-
             return _balance;
         }
     }
@@ -450,9 +444,6 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
             //      to accomplish this, `callWithMinGas` will revert.
             success = SafeCall.callWithMinGas(_tx.target, _tx.gasLimit, _tx.value, _tx.data);
         } else {
-            // Temporary revert till we support custom gas tokens
-            if (true) revert CustomGasTokenNotSupported();
-
             // Cannot call the token contract directly from the portal. This would allow an attacker
             // to call approve from a withdrawal and drain the balance of the portal.
             if (_tx.target == token) revert BadTarget();
@@ -522,9 +513,6 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
         public
         metered(_gasLimit)
     {
-        // Temporary revert till we support custom gas tokens
-        // if (true) revert CustomGasTokenNotSupported();
-
         // Can only be called if an ERC20 token is used for gas paying on L2
         (address token,) = gasPayingToken();
         if (token == Constants.ETHER) revert OnlyCustomGasToken();
@@ -575,9 +563,6 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
     {
         (address token,) = gasPayingToken();
 
-        // Temporary revert till we support custom gas tokens
-        if (token != Constants.ETHER) revert CustomGasTokenNotSupported();
-
         if (token != Constants.ETHER && msg.value != 0) revert NoValue();
 
         _depositTransaction({
@@ -640,9 +625,6 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
     /// @notice Sets the gas paying token for the L2 system. This token is used as the
     ///         L2 native asset. Only the SystemConfig contract can call this function.
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
-        // Temporary revert till we support custom gas tokens
-        // if (true) revert CustomGasTokenNotSupported();
-
         if (msg.sender != address(systemConfig)) revert Unauthorized();
 
         // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol
@@ -15,9 +15,6 @@ import { ISemver } from "interfaces/universal/ISemver.sol";
 import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
-/// @dev This is temporary. Error thrown when a chain uses a custom gas token.
-error CustomGasTokenNotSupported();
-
 /// @custom:proxied true
 /// @title SystemConfig
 /// @notice The SystemConfig contract is used to manage configuration of an Optimism network.
@@ -318,9 +315,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     /// @param _token Address of the gas paying token.
     function _setGasPayingToken(address _token) internal virtual {
         if (_token != address(0) && _token != Constants.ETHER && !isCustomGasToken()) {
-            // Temporary revert till we support custom gas tokens
-            // if (true) revert CustomGasTokenNotSupported();
-
             require(
                 ERC20(_token).decimals() == GAS_PAYING_TOKEN_DECIMALS, "SystemConfig: bad decimals of gas paying token"
             );
diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
@@ -16,9 +16,6 @@ import { IOptimismPortalInterop as IOptimismPortal } from "interfaces/L1/IOptimi
 import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 import { ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
-/// @dev This is temporary. Error thrown when a chain uses a custom gas token.
-error CustomGasTokenNotSupported();
-
 /// @custom:proxied true
 /// @title SystemConfigInterop
 /// @notice The SystemConfig contract is used to manage configuration of an Optimism network.
@@ -85,8 +82,6 @@ contract SystemConfigInterop is SystemConfig {
     /// @param _token Address of the gas paying token.
     function _setGasPayingToken(address _token) internal override {
         if (_token != address(0) && _token != Constants.ETHER && !isCustomGasToken()) {
-            // Temporary revert till we support custom gas tokens
-            if (true) revert CustomGasTokenNotSupported();
 
             require(
                 ERC20(_token).decimals() == GAS_PAYING_TOKEN_DECIMALS, "SystemConfig: bad decimals of gas paying token"
diff --git a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
@@ -869,26 +869,8 @@ contract L1CrossDomainMessenger_Test is CommonTest {
         assertEq(l1CrossDomainMessenger.paused(), superchainConfig.paused());
     }
 
-    /// @dev Temporary test that checks that correct calls to sendMessage when using a custom gas token revert with the
-    /// expected error.
-    /// @dev Should be removed when/if Custom Gas Token functionality is allowed again.
-    function test_sendMessage_customGasToken_reverts() external {
-        skipIfForkTest("Custom gas token is still supported on forked tests");
-
-        // Mock the gasPayingToken function to return a custom gas token
-        vm.mockCall(
-            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
-        );
-
-        vm.prank(alice);
-        vm.expectRevert(IOptimismPortal2.CustomGasTokenNotSupported.selector);
-        l1CrossDomainMessenger.sendMessage(recipient, hex"ff", uint32(100));
-    }
-
     /// @dev Tests that sendMessage succeeds with a custom gas token when the call value is zero.
     function test_sendMessage_customGasTokenButNoValue_succeeds() external {
-        vm.skip(true, "Custom gas token not supported");
-
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
diff --git a/packages/contracts-bedrock/test/setup/DeployVariations.t.sol b/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
