Pre release

.circleci/config.yml

@@ -565,7 +565,7 @@ jobs:
   contracts-bedrock-build:
     docker:
       - image: <<pipeline.parameters.default_docker_image>>
-    resource_class: xlarge
+    resource_class: 2xlarge
     parameters:
       build_args:
         description: Forge build arguments
@@ -865,7 +865,7 @@ jobs:
     circleci_ip_ranges: true
     docker:
       - image: <<pipeline.parameters.default_docker_image>>
-    resource_class: xlarge
+    resource_class: 2xlarge
     parameters:
       test_list:
         description: List of test files to run
@@ -2378,7 +2378,7 @@ workflows:
           dev_features: <<matrix.dev_features>>
           matrix:
             parameters:
-              dev_features: ["main", "OPTIMISM_PORTAL_INTEROP","CANNON_KONA","CANNON_KONA,DEPLOY_V2_DISPUTE_GAMES"]
+              dev_features: ["main", "OPTIMISM_PORTAL_INTEROP","CANNON_KONA","CANNON_KONA,DEPLOY_V2_DISPUTE_GAMES","CUSTOM_GAS_TOKEN"]
           # need this requires to ensure that all FFI JSONs exist
           requires:
             - contracts-bedrock-build

.gitignore

@@ -76,3 +76,7 @@ test/tmp
 test-apollo/l1-geth
 test-apollo/config-op
 test-apollo/data
+
+test-pp-op/testnet.env
+test-pp-op/mainnet.env
+test-pp-op/fakemainnet.env

Dockerfile-contracts

@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/root/.cache \
 # Create final contracts image with artifacts, foundry tools, and op-deployer
 FROM debian:bookworm-slim
 WORKDIR /app
-# RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
 
 # Set environment variables for Go
 ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt

op-acceptance-tests/acceptance-tests.yaml

@@ -132,3 +132,9 @@ gates:
     tests:
       - package: github.com/ethereum-optimism/optimism/op-acceptance-tests/tests/jovian
         timeout: 10m
+
+  - id: cgt
+    description: "Custom Gas Token (CGT) network tests."
+    tests:
+      - package: github.com/ethereum-optimism/optimism/op-acceptance-tests/tests/custom_gas_token
+        timeout: 10m

op-acceptance-tests/justfile

@@ -14,6 +14,9 @@ jovian:
 interop:
     @just acceptance-test "" interop
 
+cgt:
+    @just acceptance-test "" cgt
+
 
 # Run acceptance tests with mise-managed binary
 # Usage: just acceptance-test [devnet] [gate]

op-acceptance-tests/tests/custom_gas_token/cgt_introspection_test.go

@@ -0,0 +1,25 @@
+package custom_gas_token
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+)
+
+// TestCGT_IntrospectionViaL1Block verifies that the L2 L1Block predeploy reports
+// that CGT mode is enabled and exposes non-empty token metadata (name, symbol).
+func TestCGT_IntrospectionViaL1Block(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := presets.NewMinimal(t)
+
+	name, symbol := ensureCGTOrSkip(t, sys)
+
+	// Metadata should be non-empty.
+	if name == "" {
+		t.Require().Fail("gasPayingTokenName() returned empty string")
+	}
+	if symbol == "" {
+		t.Require().Fail("gasPayingTokenSymbol() returned empty string")
+	}
+}

op-acceptance-tests/tests/custom_gas_token/cgt_l1_portal_introspection_test.go

@@ -0,0 +1,53 @@
+package custom_gas_token
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/lmittmann/w3"
+)
+
+// TestCGT_L1PortalIntrospection checks that the L1 OptimismPortal exposes
+// a valid SystemConfig address via its systemConfig() view.
+func TestCGT_L1PortalIntrospection(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := presets.NewMinimal(t)
+
+	// Skip if this devnet is not CGT-enabled (uses your existing gate).
+	ensureCGTOrSkip(t, sys)
+
+	l1c := sys.L1EL.EthClient()
+	portal := sys.L2Chain.DepositContractAddr()
+
+	ctx, cancel := context.WithTimeout(t.Ctx(), 20*time.Second)
+	defer cancel()
+
+	// Portal exposes systemConfig() -> address
+	systemConfigFunc := w3.MustNewFunc("systemConfig()", "address")
+
+	data, err := systemConfigFunc.EncodeArgs()
+	if err != nil {
+		t.Require().Fail("encode systemConfig() args: %v", err)
+	}
+
+	out, err := l1c.Call(ctx, ethereum.CallMsg{To: &portal, Data: data}, rpc.LatestBlockNumber)
+	if err != nil {
+		t.Require().Fail("portal.systemConfig() call failed: %v", err)
+	}
+
+	var sysCfg common.Address
+	if err := systemConfigFunc.DecodeReturns(out, &sysCfg); err != nil {
+		t.Require().Fail("decode portal.systemConfig() returns: %v", err)
+	}
+
+	if sysCfg == (common.Address{}) {
+		t.Require().Fail("portal.systemConfig() returned zero address")
+	}
+}

op-acceptance-tests/tests/custom_gas_token/cgt_native_payment_test.go

@@ -0,0 +1,48 @@
+package custom_gas_token
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+)
+
+// TestCGT_ValueTransferPaysGasInToken verifies that on CGT chains a simple L2
+// value transfer charges gas in the native ERC-20, and balances reflect
+// recipient +amount and sender > amount decrease (amount + gas).
+func TestCGT_ValueTransferPaysGasInToken(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := presets.NewMinimal(t)
+
+	ensureCGTOrSkip(t, sys)
+
+	sender := sys.FunderL2.NewFundedEOA(eth.OneTenthEther)
+	recipient := sys.Wallet.NewEOA(sys.L2EL)
+
+	amount := eth.OneHundredthEther
+	beforeS := sender.GetBalance()
+	beforeR := recipient.GetBalance()
+
+	// This sends L2 native (CGT) value.
+	sender.Transfer(recipient.Address(), amount)
+
+	// Wait until recipient reflects the transfer.
+	// We don't wait on sender balance; it includes gas and is non-deterministic.
+	recipient.WaitForBalance(beforeR.Add(amount))
+
+	afterS := sender.GetBalance()
+	afterR := recipient.GetBalance()
+
+	// Recipient increased by amount
+	wantR := beforeR.Add(amount)
+	if afterR != wantR {
+		t.Require().Fail("recipient balance mismatch: got %s, want %s", afterR, wantR)
+	}
+
+	// Sender decreased by at least amount (amount + gas). Strict inequality:
+	if !(beforeS.Sub(afterS)).Gt(amount) {
+		t.Require().Fail("sender delta must exceed transferred amount (gas must be paid): before=%s after=%s amount=%s",
+			beforeS, afterS, amount)
+	}
+}

op-acceptance-tests/tests/custom_gas_token/cgt_portal_reverts_test.go

@@ -0,0 +1,34 @@
+package custom_gas_token
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+// TestCGT_PortalReceiveReverts asserts that sending ETH to the L1 OptimismPortal
+// (receive() -> depositTransaction) reverts under CGT, preventing ETH from getting stuck.
+func TestCGT_PortalReceiveReverts(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := presets.NewMinimal(t)
+	ensureCGTOrSkip(t, sys)
+
+	l1c := sys.L1EL.EthClient()
+	portal := sys.L2Chain.DepositContractAddr()
+
+	// Try to send 1 wei to the Portal (receive() -> depositTransaction); should revert in CGT mode.
+	ctx, cancel := context.WithTimeout(t.Ctx(), 20*time.Second)
+	defer cancel()
+	_, err := l1c.EstimateGas(ctx, ethereum.CallMsg{
+		To:    &portal,
+		Value: common.Big1,
+	})
+	if err == nil {
+		t.Require().Fail("expected L1 Portal to revert on direct ETH send in CGT mode, but estimator returned no error")
+	}
+}

op-acceptance-tests/tests/custom_gas_token/cgt_reverts_test.go

@@ -0,0 +1,68 @@
+package custom_gas_token
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+
+	"math/big"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/lmittmann/w3"
+)
+
+// TestCGT_MessengerRejectsValue ensures that sending native value to the
+// L2CrossDomainMessenger reverts under CGT (non-payable path).
+func TestCGT_MessengerRejectsValue(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := presets.NewMinimal(t)
+	ensureCGTOrSkip(t, sys)
+
+	ctx, cancel := context.WithTimeout(t.Ctx(), 30*time.Second)
+	defer cancel()
+
+	from := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther).Address()
+	_, err := sys.L2EL.Escape().L2EthClient().EstimateGas(ctx, ethereum.CallMsg{
+		From:  from,
+		To:    &l2XDMAddr,
+		Value: big.NewInt(1), // 1 wei native
+		Data:  nil,
+	})
+	if err == nil {
+		t.Require().Fail("expected estimation error when sending value to L2CrossDomainMessenger in CGT mode")
+	}
+}
+
+// TestCGT_L2StandardBridge_LegacyWithdrawReverts verifies that the legacy
+// ETH-specific withdraw path on L2StandardBridge reverts under CGT.
+func TestCGT_L2StandardBridge_LegacyWithdrawReverts(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := presets.NewMinimal(t)
+	ensureCGTOrSkip(t, sys)
+
+	ctx, cancel := context.WithTimeout(t.Ctx(), 30*time.Second)
+	defer cancel()
+
+	withdrawFunc := w3.MustNewFunc("withdraw(address,uint256,uint32,bytes)", "")
+
+	// Any address is fine; the ETH-specific legacy path should be disabled under CGT.
+	anyAddress := l2XDMAddr
+	data, err := withdrawFunc.EncodeArgs(anyAddress, big.NewInt(1), uint32(100_000), []byte{})
+	if err != nil {
+		t.Require().Fail("%v", err)
+	}
+
+	from := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther).Address()
+	_, err = sys.L2EL.Escape().L2EthClient().EstimateGas(ctx, ethereum.CallMsg{
+		From: from,
+		To:   &l2BridgeAddr,
+		Data: data,
+	})
+	if err == nil {
+		t.Require().Fail("expected estimation error for L2StandardBridge.withdraw under CGT")
+	}
+}