fix: CGT review fixes

.circleci/config.yml

@@ -2038,7 +2038,8 @@ workflows:
           dev_features: <<matrix.dev_features>>
           matrix:
             parameters:
-              dev_features: ["main", "OPTIMISM_PORTAL_INTEROP"]
+              dev_features:
+                ["main", "OPTIMISM_PORTAL_INTEROP", "CUSTOM_GAS_TOKEN"]
           # need this requires to ensure that all FFI JSONs exist
           requires:
             - contracts-bedrock-build

op-chain-ops/interopgen/deploy.go

@@ -247,7 +247,6 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 		AllowCustomDisputeParameters: true,
 		OperatorFeeScalar:            cfg.GasPriceOracleOperatorFeeScalar,
 		OperatorFeeConstant:          cfg.GasPriceOracleOperatorFeeConstant,
-		UseCustomGasToken:            cfg.UseCustomGasToken,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy L2 OP chain: %w", err)

op-deployer/pkg/deployer/integration_test/apply_test.go

@@ -243,14 +243,20 @@ func TestEndToEndApply(t *testing.T) {
 
 	t.Run("with custom gas token", func(t *testing.T) {
 		intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
+
+		// CGT config for L2 genesis
 		amount := new(big.Int)
 		amount.SetString("1000000000000000000000", 10)
-		intent.Chains[0].CustomGasToken = &state.CustomGasToken{
+		intent.Chains[0].CustomGasToken = state.CustomGasToken{
 			Enabled:                    true,
 			Name:                       "Custom Gas Token",
 			Symbol:                     "CGT",
 			NativeAssetLiquidityAmount: (*hexutil.Big)(amount),
 		}
+		// CGT config for OPCM
+		intent.GlobalDeployOverrides = map[string]interface{}{
+			"devFeatureBitmap": common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000010"),
+		}
 
 		require.NoError(t, deployer.ApplyPipeline(ctx, deployer.ApplyPipelineOpts{
 			DeploymentTarget:   deployer.DeploymentTargetLive,
@@ -279,6 +285,13 @@ func TestEndToEndApply(t *testing.T) {
 		err = fn.DecodeReturns(res, &response)
 		require.NoError(t, err)
 		require.Equal(t, true, response)
+
+		// Check that the native asset liquidity predeploy has the configured amount in L2 genesis
+		nativeAssetLiquidityAddr := common.HexToAddress("0x4200000000000000000000000000000000000029")
+		l2Genesis := st.Chains[0].Allocs.Data.Accounts
+		account, exists := l2Genesis[nativeAssetLiquidityAddr]
+		require.True(t, exists, "Native asset liquidity predeploy should exist in L2 genesis")
+		require.Equal(t, amount, account.Balance, "Native asset liquidity predeploy should have the configured balance")
 	})
 }
 
@@ -753,7 +766,7 @@ func newChainIntent(t *testing.T, dk *devkeys.MnemonicDevKeys, l1ChainID *big.In
 			Proposer:          addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
 			Challenger:        addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
 		},
-		CustomGasToken: &state.CustomGasToken{
+		CustomGasToken: state.CustomGasToken{
 			Enabled: false,
 			Name:    "",
 			Symbol:  "",

op-deployer/pkg/deployer/opcm/opchain.go

@@ -40,7 +40,6 @@ type DeployOPChainInput struct {
 	DisputeClockExtension        uint64
 	DisputeMaxClockDuration      uint64
 	AllowCustomDisputeParameters bool
-	UseCustomGasToken            bool
 
 	OperatorFeeScalar   uint32
 	OperatorFeeConstant uint64

op-deployer/pkg/deployer/pipeline/l2genesis.go

@@ -154,8 +154,9 @@ func calculateL2GenesisOverrides(intent *state.Intent, thisIntent *state.ChainIn
 		}
 	}
 
-	if thisIntent.CustomGasToken == nil {
-		thisIntent.CustomGasToken = &state.CustomGasToken{
+	// If CustomGasToken is not enabled, update it with override values
+	if !thisIntent.CustomGasToken.Enabled {
+		thisIntent.CustomGasToken = state.CustomGasToken{
 			Enabled:                    overrides.UseCustomGasToken,
 			Name:                       overrides.GasPayingTokenName,
 			Symbol:                     overrides.GasPayingTokenSymbol,

op-deployer/pkg/deployer/pipeline/opchain.go

@@ -110,7 +110,6 @@ func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common
 		DisputeClockExtension:        proofParams.DisputeClockExtension,   // 3 hours (input in seconds)
 		DisputeMaxClockDuration:      proofParams.DisputeMaxClockDuration, // 3.5 days (input in seconds)
 		AllowCustomDisputeParameters: proofParams.DangerouslyAllowCustomDisputeParameters,
-		UseCustomGasToken:            thisIntent.CustomGasToken != nil && thisIntent.CustomGasToken.Enabled,
 		OperatorFeeScalar:            thisIntent.OperatorFeeScalar,
 		OperatorFeeConstant:          thisIntent.OperatorFeeConstant,
 	}, nil

op-deployer/pkg/deployer/state/chain_intent.go

@@ -59,8 +59,8 @@ type L2DevGenesisParams struct {
 
 type CustomGasToken struct {
 	Enabled                    bool         `json:"enabled" toml:"enabled"`
-	Name                       string       `json:"name" toml:"name"`
-	Symbol                     string       `json:"symbol" toml:"symbol"`
+	Name                       string       `json:"name,omitempty" toml:"name,omitempty"`
+	Symbol                     string       `json:"symbol,omitempty" toml:"symbol,omitempty"`
 	NativeAssetLiquidityAmount *hexutil.Big `json:"nativeAssetLiquidityAmount,omitempty" toml:"nativeAssetLiquidityAmount,omitempty"`
 }
 
@@ -81,7 +81,7 @@ type ChainIntent struct {
 	OperatorFeeConstant        uint64                    `json:"operatorFeeConstant,omitempty" toml:"operatorFeeConstant,omitempty"`
 	L1StartBlockHash           *common.Hash              `json:"l1StartBlockHash,omitempty" toml:"l1StartBlockHash,omitempty"`
 	MinBaseFee                 uint64                    `json:"minBaseFee,omitempty" toml:"minBaseFee,omitempty"`
-	CustomGasToken             *CustomGasToken           `json:"customGasToken" toml:"customGasToken"`
+	CustomGasToken             CustomGasToken            `json:"customGasToken" toml:"customGasToken"`
 	// Optional. For development purposes only. Only enabled if the operation mode targets a genesis-file output.
 	L2DevGenesisParams *L2DevGenesisParams `json:"l2DevGenesisParams,omitempty" toml:"l2DevGenesisParams,omitempty"`
 }
@@ -127,7 +127,7 @@ func (c *ChainIntent) Check() error {
 		return fmt.Errorf("%w: chainId=%s", ErrFeeVaultZeroAddress, c.ID)
 	}
 
-	if c.CustomGasToken != nil && c.CustomGasToken.Enabled {
+	if c.CustomGasToken.Enabled {
 		if c.CustomGasToken.Name == "" {
 			return fmt.Errorf("%w: CustomGasToken.Name cannot be empty when enabled, chainId=%s", ErrIncompatibleValue, c.ID)
 		}
@@ -150,7 +150,7 @@ func (c *ChainIntent) Check() error {
 // GetNativeAssetLiquidityAmount returns the native asset liquidity amount for the chain.
 // If not set, returns the default value of zero.
 func (c *ChainIntent) GetNativeAssetLiquidityAmount() *big.Int {
-	if c.CustomGasToken != nil && c.CustomGasToken.NativeAssetLiquidityAmount != nil {
+	if c.CustomGasToken.NativeAssetLiquidityAmount != nil {
 		return c.CustomGasToken.NativeAssetLiquidityAmount.ToInt()
 	}
 

op-deployer/pkg/deployer/state/deploy_config_test.go

@@ -1,6 +1,7 @@
 package state
 
 import (
+	"math/big"
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/addresses"
@@ -33,10 +34,11 @@ func TestCombineDeployConfig(t *testing.T) {
 			UnsafeBlockSigner: common.HexToAddress("0xabc"),
 			Batcher:           common.HexToAddress("0xdef"),
 		},
-		CustomGasToken: &CustomGasToken{
-			Enabled: false,
-			Name:    "Test",
-			Symbol:  "TEST",
+		CustomGasToken: CustomGasToken{
+			Enabled:                    false,
+			Name:                       "",
+			Symbol:                     "",
+			NativeAssetLiquidityAmount: (*hexutil.Big)(big.NewInt(0)),
 		},
 	}
 	state := State{

op-deployer/pkg/deployer/state/intent.go

@@ -158,8 +158,7 @@ func (c *Intent) validateStandardValues() error {
 		if len(chain.AdditionalDisputeGames) > 0 {
 			return fmt.Errorf("%w: chainId=%s additionalDisputeGames must be nil", ErrNonStandardValue, chain.ID)
 		}
-
-		if chain.CustomGasToken != nil {
+		if chain.CustomGasToken.Enabled {
 			return fmt.Errorf("%w: chainId=%s custom gas token must be nil for standard chains", ErrNonStandardValue, chain.ID)
 		}
 	}
@@ -303,11 +302,11 @@ func NewIntentCustom(l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error)
 		intent.Chains = append(intent.Chains, &ChainIntent{
 			ID:       l2ChainID,
 			GasLimit: standard.GasLimit,
-			CustomGasToken: &CustomGasToken{
+			CustomGasToken: CustomGasToken{
 				Enabled:                    false,
 				Name:                       "",
 				Symbol:                     "",
-				NativeAssetLiquidityAmount: nil,
+				NativeAssetLiquidityAmount: (*hexutil.Big)(big.NewInt(0)),
 			},
 		})
 	}
@@ -353,7 +352,12 @@ func NewIntentStandard(l1ChainId uint64, l2ChainIds []common.Hash) (Intent, erro
 				L1ProxyAdminOwner: l1ProxyAdminOwner,
 				L2ProxyAdminOwner: l2ProxyAdminOwner,
 			},
-			CustomGasToken: nil, // Standard chains must have nil CustomGasToken
+			CustomGasToken: CustomGasToken{
+				Enabled:                    false,
+				Name:                       "",
+				Symbol:                     "",
+				NativeAssetLiquidityAmount: (*hexutil.Big)(big.NewInt(0)),
+			},
 		})
 	}
 	return intent, nil

op-deployer/pkg/deployer/state/intent_test.go

@@ -67,11 +67,11 @@ func TestValidateStandardValues(t *testing.T) {
 		{
 			"CustomGasToken",
 			func(intent *Intent) {
-				intent.Chains[0].CustomGasToken = &CustomGasToken{
-					Enabled:                    false,
-					Name:                       "",
-					Symbol:                     "",
-					NativeAssetLiquidityAmount: (*hexutil.Big)(big.NewInt(0)),
+				intent.Chains[0].CustomGasToken = CustomGasToken{
+					Enabled:                    true,
+					Name:                       "Custom Gas Token",
+					Symbol:                     "CGT",
+					NativeAssetLiquidityAmount: (*hexutil.Big)(big.NewInt(1000)),
 				}
 			},
 			ErrNonStandardValue,
@@ -176,7 +176,7 @@ func TestValidateCustomValues(t *testing.T) {
 		{
 			"empty custom gas token name when enabled",
 			func(intent *Intent) {
-				intent.Chains[0].CustomGasToken = &CustomGasToken{
+				intent.Chains[0].CustomGasToken = CustomGasToken{
 					Enabled: true,
 					Name:    "",
 					Symbol:  "CGT",
@@ -187,7 +187,7 @@ func TestValidateCustomValues(t *testing.T) {
 		{
 			"empty custom gas token symbol when enabled",
 			func(intent *Intent) {
-				intent.Chains[0].CustomGasToken = &CustomGasToken{
+				intent.Chains[0].CustomGasToken = CustomGasToken{
 					Enabled: true,
 					Name:    "Custom Gas Token",
 					Symbol:  "",
@@ -257,7 +257,7 @@ func setCustomGasToken(intent *Intent) {
 	amount := new(big.Int)
 	amount.SetString("1000000000000000000000", 10)
 
-	intent.Chains[0].CustomGasToken = &CustomGasToken{
+	intent.Chains[0].CustomGasToken = CustomGasToken{
 		Enabled:                    true,
 		Name:                       "Custom Gas Token",
 		Symbol:                     "CGT",

op-e2e/config/init.go

@@ -400,11 +400,11 @@ func defaultIntent(root string, loc *artifacts.Locator, deployer common.Address,
 					Proposer:          addrs.Proposer,
 					Challenger:        common.HexToAddress("0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65"),
 				},
-				CustomGasToken: &state.CustomGasToken{
+				CustomGasToken: state.CustomGasToken{
 					Enabled:                    false,
 					Name:                       "",
 					Symbol:                     "",
-					NativeAssetLiquidityAmount: nil,
+					NativeAssetLiquidityAmount: (*hexutil.Big)(big.NewInt(0)),
 				},
 				AdditionalDisputeGames: []state.AdditionalDisputeGame{
 					{

op-e2e/e2eutils/intentbuilder/builder.go

@@ -390,7 +390,7 @@ func (c *l2Configurator) WithEIP1559Denominator(value uint64) {
 }
 
 func (c *l2Configurator) WithCustomGasToken(enabled bool, name, symbol string, nativeAssetLiquidityAmount *big.Int) {
-	c.builder.intent.Chains[c.chainIndex].CustomGasToken = &state.CustomGasToken{
+	c.builder.intent.Chains[c.chainIndex].CustomGasToken = state.CustomGasToken{
 		Enabled:                    enabled,
 		Name:                       name,
 		Symbol:                     symbol,

op-e2e/e2eutils/intentbuilder/builder_test.go

@@ -163,7 +163,7 @@ func TestBuilder(t *testing.T) {
 				GasLimit:                 standard.GasLimit,
 				OperatorFeeScalar:        100,
 				OperatorFeeConstant:      200,
-				CustomGasToken: &state.CustomGasToken{
+				CustomGasToken: state.CustomGasToken{
 					Enabled:                    false,
 					Name:                       "",
 					Symbol:                     "",

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

@@ -145,7 +145,6 @@ interface IOPContractsManager {
         uint32 basefeeScalar;
         uint32 blobBasefeeScalar;
         uint256 l2ChainId;
-        bool useCustomGasToken;
         // The correct type is OutputRoot memory but OP Deployer does not yet support structs.
         bytes startingAnchorRoot;
         // The salt mixer is used as part of making the resulting salt unique.

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

@@ -71,13 +71,8 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
         external;
     function finalizedWithdrawals(bytes32) external view returns (bool);
     function guardian() external view returns (address);
-    function initialize(
-        ISystemConfig _systemConfig,
-        IAnchorStateRegistry _anchorStateRegistry
-    )
-        external;
+    function initialize(ISystemConfig _systemConfig, IAnchorStateRegistry _anchorStateRegistry) external;
     function initVersion() external view returns (uint8);
-    function isCustomGasToken() external view returns (bool);
     function l2Sender() external view returns (address);
     function minimumGasLimit(uint64 _byteCount) external pure returns (uint64);
     function numProofSubmitters(bytes32 _withdrawalHash) external view returns (uint256);

packages/contracts-bedrock/scripts/L2Genesis.s.sol

@@ -124,6 +124,7 @@ contract L2Genesis is Script {
         if (_input.fundDevAccounts) {
             fundDevAccounts();
         }
+
         vm.stopPrank();
         vm.deal(deployer, 0);
         vm.resetNonce(deployer);
@@ -600,6 +601,11 @@ contract L2Genesis is Script {
     function setNativeAssetLiquidity(Input memory _input) internal {
         _setImplementationCode(Predeploys.NATIVE_ASSET_LIQUIDITY);
 
+        require(
+            _input.nativeAssetLiquidityAmount <= type(uint248).max,
+            "L2Genesis: native asset liquidity amount must be less than or equal to type(uint248).max"
+        );
+
         // Pre-fund the liquidity contract with the specified amount
         vm.deal(Predeploys.NATIVE_ASSET_LIQUIDITY, _input.nativeAssetLiquidityAmount);
     }

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

@@ -423,7 +423,6 @@ contract Deploy is Deployer {
             basefeeScalar: cfg.basefeeScalar(),
             blobBasefeeScalar: cfg.blobbasefeeScalar(),
             l2ChainId: cfg.l2ChainID(),
-            useCustomGasToken: cfg.useCustomGasToken(),
             startingAnchorRoot: abi.encode(
                 Proposal({ root: Hash.wrap(cfg.faultGameGenesisOutputRoot()), l2SequenceNumber: cfg.faultGameGenesisBlock() })
             ),

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

@@ -128,7 +128,7 @@ contract DeployConfig is Script {
         useCustomGasToken = _readOr(_json, "$.useCustomGasToken", false);
         gasPayingTokenName = _readOr(_json, "$.gasPayingTokenName", "");
         gasPayingTokenSymbol = _readOr(_json, "$.gasPayingTokenSymbol", "");
-        nativeAssetLiquidityAmount = _readOr(_json, "$.nativeAssetLiquidityAmount", type(uint248).max);
+        nativeAssetLiquidityAmount = _readOr(_json, "$.nativeAssetLiquidityAmount", 0);
 
         enableGovernance = _readOr(_json, "$.enableGovernance", false);
         systemConfigStartBlock = stdJson.readUint(_json, "$.systemConfigStartBlock");
@@ -238,6 +238,11 @@ contract DeployConfig is Script {
         useCustomGasToken = _useCustomGasToken;
     }
 
+    /// @notice Allow the `nativeAssetLiquidityAmount` config to be overridden in testing environments
+    function setNativeAssetLiquidityAmount(uint256 _nativeAssetLiquidityAmount) public {
+        nativeAssetLiquidityAmount = _nativeAssetLiquidityAmount;
+    }
+
     /// @notice Allow the `baseFeeVaultWithdrawalNetwork` config to be overridden in testing environments
     function setBaseFeeVaultWithdrawalNetwork(uint256 _baseFeeVaultWithdrawalNetwork) public {
         baseFeeVaultWithdrawalNetwork = _baseFeeVaultWithdrawalNetwork;

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

@@ -55,7 +55,6 @@ contract DeployOPChainInput is BaseDeployIO {
     Duration internal _disputeClockExtension;
     Duration internal _disputeMaxClockDuration;
     bool internal _allowCustomDisputeParameters;
-    bool internal _useCustomGasToken;
 
     uint32 internal _operatorFeeScalar;
     uint64 internal _operatorFeeConstant;
@@ -118,8 +117,6 @@ contract DeployOPChainInput is BaseDeployIO {
     function set(bytes4 _sel, bool _value) public {
         if (_sel == this.allowCustomDisputeParameters.selector) {
             _allowCustomDisputeParameters = _value;
-        } else if (_sel == this.useCustomGasToken.selector) {
-            _useCustomGasToken = _value;
         } else {
             revert("DeployOPChainInput: unknown selector");
         }
@@ -171,10 +168,6 @@ contract DeployOPChainInput is BaseDeployIO {
         return _l2ChainId;
     }
 
-    function useCustomGasToken() public view returns (bool) {
-        return _useCustomGasToken;
-    }
-
     function startingAnchorRoot() public pure returns (bytes memory) {
         // WARNING: For now always hardcode the starting permissioned game anchor root to 0xdead,
         // and we do not set anything for the permissioned game. This is because we currently only
@@ -394,8 +387,7 @@ contract DeployOPChain is Script {
             disputeMaxGameDepth: _doi.disputeMaxGameDepth(),
             disputeSplitDepth: _doi.disputeSplitDepth(),
             disputeClockExtension: _doi.disputeClockExtension(),
-            disputeMaxClockDuration: _doi.disputeMaxClockDuration(),
-            useCustomGasToken: _doi.useCustomGasToken()
+            disputeMaxClockDuration: _doi.disputeMaxClockDuration()
         });
 
         vm.broadcast(msg.sender);

packages/contracts-bedrock/scripts/libraries/Config.sol

@@ -240,4 +240,9 @@ library Config {
     function devFeatureInterop() internal view returns (bool) {
         return vm.envOr("DEV_FEATURE__OPTIMISM_PORTAL_INTEROP", false);
     }
+
+    /// @notice Returns true if the development feature custom gas token is enabled.
+    function devFeatureCustomGasToken() internal view returns (bool) {
+        return vm.envOr("DEV_FEATURE__CUSTOM_GAS_TOKEN", false);
+    }
 }

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

@@ -303,11 +303,6 @@
             "name": "l2ChainId",
             "type": "uint256"
           },
-          {
-            "internalType": "bool",
-            "name": "useCustomGasToken",
-            "type": "bool"
-          },
           {
             "internalType": "bytes",
             "name": "startingAnchorRoot",