contracts-bedrock: remove GCT code (#13921)

* contracts-bedrock: remove GCT code

This commit removes the custom gas token code from the L2 contracts.
The interop contracts were tightly integrated into this code,
so the diff is quite large.

We cannot remove the getters from the `L1Block` contract because
chains did a genesis with `WETH` that calls out to the `L1Block`
contract. `WETH` is not proxied, so we cannot modify the bytecode
without an irregular state transition. Just going to leave the
functions on `L1Block` for simplicity.

Both the messenger and the bridge have the references to CGT removed.

* l1block: test coverage

* contracts-bedrock: more cleanup

* compiler error

* gas-snapshot

* contracts-bedrock: remove dead imports

* ctb: unused imports

* snapshots: update

* interfaces

* ctb: fix

Author: tynes

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();

packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.0;
 
 import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
-/// @notice This interface corresponds to the Custom Gas Token version of the SystemConfig contract.
 interface ISystemConfig {
     enum UpdateType {
         BATCHER,

packages/contracts-bedrock/interfaces/L2/IETHLiquidity.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 interface IETHLiquidity {
-    error NotCustomGasToken();
     error Unauthorized();
 
     event LiquidityBurned(address indexed caller, uint256 value);

packages/contracts-bedrock/interfaces/L2/IL1Block.sol

@@ -2,26 +2,21 @@
 pragma solidity ^0.8.0;
 
 interface IL1Block {
-    error NotDepositor();
-
-    event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
-
     function DEPOSITOR_ACCOUNT() external pure returns (address addr_);
     function baseFeeScalar() external view returns (uint32);
     function basefee() external view returns (uint256);
     function batcherHash() external view returns (bytes32);
     function blobBaseFee() external view returns (uint256);
     function blobBaseFeeScalar() external view returns (uint32);
-    function gasPayingToken() external view returns (address addr_, uint8 decimals_);
-    function gasPayingTokenName() external view returns (string memory name_);
-    function gasPayingTokenSymbol() external view returns (string memory symbol_);
+    function gasPayingToken() external pure returns (address addr_, uint8 decimals_);
+    function gasPayingTokenName() external pure returns (string memory name_);
+    function gasPayingTokenSymbol() external pure returns (string memory symbol_);
     function hash() external view returns (bytes32);
-    function isCustomGasToken() external view returns (bool);
+    function isCustomGasToken() external pure returns (bool is_);
     function l1FeeOverhead() external view returns (uint256);
     function l1FeeScalar() external view returns (uint256);
     function number() external view returns (uint64);
     function sequenceNumber() external view returns (uint64);
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setL1BlockValues(
         uint64 _number,
         uint64 _timestamp,

packages/contracts-bedrock/interfaces/L2/IL1BlockInterop.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 enum ConfigType {
-    SET_GAS_PAYING_TOKEN,
     ADD_DEPENDENCY,
     REMOVE_DEPENDENCY
 }
@@ -17,7 +16,6 @@ interface IL1BlockInterop {
 
     event DependencyAdded(uint256 indexed chainId);
     event DependencyRemoved(uint256 indexed chainId);
-    event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
 
     function DEPOSITOR_ACCOUNT() external pure returns (address addr_);
     function baseFeeScalar() external view returns (uint32);
@@ -27,19 +25,18 @@ interface IL1BlockInterop {
     function blobBaseFeeScalar() external view returns (uint32);
     function dependencySetSize() external view returns (uint8);
     function depositsComplete() external;
-    function gasPayingToken() external view returns (address addr_, uint8 decimals_);
-    function gasPayingTokenName() external view returns (string memory name_);
-    function gasPayingTokenSymbol() external view returns (string memory symbol_);
+    function gasPayingToken() external pure returns (address addr_, uint8 decimals_);
+    function gasPayingTokenName() external pure returns (string memory name_);
+    function gasPayingTokenSymbol() external pure returns (string memory symbol_);
     function hash() external view returns (bytes32);
-    function isCustomGasToken() external view returns (bool);
+    function isCustomGasToken() external pure returns (bool is_);
     function isDeposit() external view returns (bool isDeposit_);
     function isInDependencySet(uint256 _chainId) external view returns (bool);
     function l1FeeOverhead() external view returns (uint256);
     function l1FeeScalar() external view returns (uint256);
     function number() external view returns (uint64);
     function sequenceNumber() external view returns (uint64);
     function setConfig(ConfigType _type, bytes memory _value) external;
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setL1BlockValues(
         uint64 _number,
         uint64 _timestamp,

packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol

@@ -7,7 +7,6 @@ import { ISemver } from "interfaces/universal/ISemver.sol";
 
 interface ISuperchainWETH is IWETH98, IERC7802, ISemver {
     error Unauthorized();
-    error NotCustomGasToken();
     error InvalidCrossDomainSender();
     error ZeroAddress();
 
@@ -16,7 +15,7 @@ interface ISuperchainWETH is IWETH98, IERC7802, ISemver {
     event RelayETH(address indexed from, address indexed to, uint256 amount, uint256 source);
 
     function balanceOf(address src) external view returns (uint256);
-    function withdraw(uint256 _amount) external;
+    function withdraw(uint256 wad) external;
     function supportsInterface(bytes4 _interfaceId) external view returns (bool);
     function sendETH(address _to, uint256 _chainId) external payable returns (bytes32 msgHash_);
     function relayETH(address _from, address _to, uint256 _amount) external;

packages/contracts-bedrock/scripts/deploy/Deploy.s.sol

@@ -210,12 +210,6 @@ contract Deploy is Deployer {
         );
         vm.stopPrank();
 
-        if (cfg.useCustomGasToken()) {
-            // Reset the systemconfig then reinitialize it with the custom gas token
-            resetInitializedProxy("SystemConfig");
-            initializeSystemConfig();
-        }
-
         if (cfg.useAltDA()) {
             bytes32 typeHash = keccak256(bytes(cfg.daCommitmentType()));
             bytes32 keccakHash = keccak256(bytes("KeccakCommitment"));
@@ -505,11 +499,6 @@ contract Deploy is Deployer {
 
         bytes32 batcherHash = bytes32(uint256(uint160(cfg.batchSenderAddress())));
 
-        address customGasTokenAddress = Constants.ETHER;
-        if (cfg.useCustomGasToken()) {
-            customGasTokenAddress = cfg.customGasTokenAddress();
-        }
-
         IProxyAdmin proxyAdmin = IProxyAdmin(payable(artifacts.mustGetAddress("ProxyAdmin")));
         proxyAdmin.upgradeAndCall({
             _proxy: payable(systemConfigProxy),

packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol

@@ -85,9 +85,6 @@ contract DeployConfig is Script {
     uint256 public daBondSize;
     uint256 public daResolverRefundPercentage;
 
-    bool public useCustomGasToken;
-    address public customGasTokenAddress;
-
     bool public useInterop;
     bool public useUpgradedFork;
 
@@ -171,9 +168,6 @@ contract DeployConfig is Script {
         daBondSize = _readOr(_json, "$.daBondSize", 1000000000);
         daResolverRefundPercentage = _readOr(_json, "$.daResolverRefundPercentage", 0);
 
-        useCustomGasToken = _readOr(_json, "$.useCustomGasToken", false);
-        customGasTokenAddress = _readOr(_json, "$.customGasTokenAddress", address(0));
-
         useInterop = _readOr(_json, "$.useInterop", false);
         useUpgradedFork;
     }
@@ -232,12 +226,6 @@ contract DeployConfig is Script {
         fundDevAccounts = _fundDevAccounts;
     }
 
-    /// @notice Allow the `useCustomGasToken` config to be overridden in testing environments
-    function setUseCustomGasToken(address _token) public {
-        useCustomGasToken = true;
-        customGasTokenAddress = _token;
-    }
-
     /// @notice Allow the `useUpgradedFork` config to be overridden in testing environments
     /// @dev When true, the forked system WILL be upgraded in setUp().
     ///      When false, the forked system WILL NOT be upgraded in setUp().

packages/contracts-bedrock/snapshots/.gas-snapshot

@@ -1,13 +1,13 @@
-GasBenchMark_L1BlockInterop_DepositsComplete:test_depositsComplete_benchmark() (gas: 7589)
-GasBenchMark_L1BlockInterop_DepositsComplete_Warm:test_depositsComplete_benchmark() (gas: 5589)
-GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchmark() (gas: 175722)
+GasBenchMark_L1BlockInterop_DepositsComplete:test_depositsComplete_benchmark() (gas: 7567)
+GasBenchMark_L1BlockInterop_DepositsComplete_Warm:test_depositsComplete_benchmark() (gas: 5567)
+GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchmark() (gas: 175700)
 GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5144)
-GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158553)
-GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7619)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 356487)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2954716)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 551627)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4063775)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 450267)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3496188)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 59798)
+GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158487)
+GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 356475)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2954682)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 551585)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4063778)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 450277)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3496176)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 59843)

packages/contracts-bedrock/snapshots/abi/ETHLiquidity.json

@@ -70,11 +70,6 @@
     "name": "LiquidityMinted",
     "type": "event"
   },
-  {
-    "inputs": [],
-    "name": "NotCustomGasToken",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "Unauthorized",