remove CGT code

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();
@@ -24,13 +23,10 @@ interface IOptimismPortal2 {
     error InvalidMerkleProof();
     error InvalidProof();
     error LargeCalldata();
-    error NoValue();
     error NonReentrant();
-    error OnlyCustomGasToken();
     error OutOfGas();
     error ProposalNotValidated();
     error SmallGasLimit();
-    error TransferFailed();
     error Unauthorized();
     error UnexpectedList();
     error UnexpectedString();
@@ -46,18 +42,8 @@ interface IOptimismPortal2 {
 
     receive() external payable;
 
-    function balance() external view returns (uint256);
     function blacklistDisputeGame(IDisputeGame _disputeGame) external;
     function checkWithdrawal(bytes32 _withdrawalHash, address _proofSubmitter) external view;
-    function depositERC20Transaction(
-        address _to,
-        uint256 _mint,
-        uint256 _value,
-        uint64 _gasLimit,
-        bool _isCreation,
-        bytes memory _data
-    )
-        external;
     function depositTransaction(
         address _to,
         uint256 _value,
@@ -109,7 +95,6 @@ interface IOptimismPortal2 {
         returns (IDisputeGame disputeGameProxy, uint64 timestamp); // nosemgrep
     function respectedGameType() external view returns (GameType);
     function respectedGameTypeUpdatedAt() external view returns (uint64);
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setRespectedGameType(GameType _gameType) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);

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

@@ -25,13 +25,10 @@ interface IOptimismPortalInterop {
     error InvalidMerkleProof();
     error InvalidProof();
     error LargeCalldata();
-    error NoValue();
     error NonReentrant();
-    error OnlyCustomGasToken();
     error OutOfGas();
     error ProposalNotValidated();
     error SmallGasLimit();
-    error TransferFailed();
     error Unauthorized();
     error UnexpectedList();
     error UnexpectedString();
@@ -47,18 +44,8 @@ interface IOptimismPortalInterop {
 
     receive() external payable;
 
-    function balance() external view returns (uint256);
     function blacklistDisputeGame(IDisputeGame _disputeGame) external;
     function checkWithdrawal(bytes32 _withdrawalHash, address _proofSubmitter) external view;
-    function depositERC20Transaction(
-        address _to,
-        uint256 _mint,
-        uint256 _value,
-        uint64 _gasLimit,
-        bool _isCreation,
-        bytes memory _data
-    )
-        external;
     function depositTransaction(
         address _to,
         uint256 _value,
@@ -111,7 +98,6 @@ interface IOptimismPortalInterop {
     function respectedGameType() external view returns (GameType);
     function respectedGameTypeUpdatedAt() external view returns (uint64);
     function setConfig(ConfigType _type, bytes memory _value) external;
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setRespectedGameType(GameType _gameType) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);

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,
@@ -22,7 +20,6 @@ interface ISystemConfig {
         address disputeGameFactory;
         address optimismPortal;
         address optimismMintableERC20Factory;
-        address gasPayingToken;
     }
 
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
@@ -47,9 +44,6 @@ interface ISystemConfig {
     function gasLimit() external view returns (uint64);
     function eip1559Denominator() external view returns (uint32);
     function eip1559Elasticity() 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 initialize(
         address _owner,
         uint32 _basefeeScalar,
@@ -62,7 +56,6 @@ interface ISystemConfig {
         Addresses memory _addresses
     )
         external;
-    function isCustomGasToken() external view returns (bool);
     function l1CrossDomainMessenger() external view returns (address addr_);
     function l1ERC721Bridge() external view returns (address addr_);
     function l1StandardBridge() external view returns (address addr_);

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);
@@ -29,10 +27,6 @@ interface ISystemConfigInterop {
     function gasLimit() external view returns (uint64);
     function eip1559Denominator() external view returns (uint32);
     function eip1559Elasticity() 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 isCustomGasToken() external view returns (bool);
     function l1CrossDomainMessenger() external view returns (address addr_);
     function l1ERC721Bridge() external view returns (address addr_);
     function l1StandardBridge() external view returns (address addr_);

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

@@ -530,8 +530,7 @@ contract Deploy is Deployer {
                         l1StandardBridge: artifacts.mustGetAddress("L1StandardBridgeProxy"),
                         disputeGameFactory: artifacts.mustGetAddress("DisputeGameFactoryProxy"),
                         optimismPortal: artifacts.mustGetAddress("OptimismPortalProxy"),
-                        optimismMintableERC20Factory: artifacts.mustGetAddress("OptimismMintableERC20FactoryProxy"),
-                        gasPayingToken: customGasTokenAddress
+                        optimismMintableERC20Factory: artifacts.mustGetAddress("OptimismMintableERC20FactoryProxy")
                     })
                 )
             )

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

@@ -563,8 +563,6 @@ contract DeployOPChain is Script {
             systemConfig.optimismMintableERC20Factory() == address(_doo.optimismMintableERC20FactoryProxy()),
             "SYSCON-210"
         );
-        (address gasPayingToken,) = systemConfig.gasPayingToken();
-        require(gasPayingToken == Constants.ETHER, "SYSCON-220");
     }
 
     function assertValidL1CrossDomainMessenger(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {

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

@@ -4,10 +4,10 @@ GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchm
 GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5144)
 GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
 GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369264)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967493)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564413)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076606)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467092)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512819)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72667)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 356487)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2954716)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 551636)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4063829)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 450322)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3496221)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 59849)

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

@@ -19,19 +19,6 @@
     "stateMutability": "payable",
     "type": "receive"
   },
-  {
-    "inputs": [],
-    "name": "balance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -63,44 +50,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_mint",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint64",
-        "name": "_gasLimit",
-        "type": "uint64"
-      },
-      {
-        "internalType": "bool",
-        "name": "_isCreation",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "depositERC20Transaction",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -602,34 +551,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint8",
-        "name": "_decimals",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_name",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_symbol",
-        "type": "bytes32"
-      }
-    ],
-    "name": "setGasPayingToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -846,11 +767,6 @@
     "name": "ContentLengthMismatch",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "CustomGasTokenNotSupported",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "EmptyItem",
@@ -896,21 +812,11 @@
     "name": "LargeCalldata",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "NoValue",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "NonReentrant",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "OnlyCustomGasToken",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "OutOfGas",
@@ -926,11 +832,6 @@
     "name": "SmallGasLimit",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "TransferFailed",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "Unauthorized",