refactor(contracts): remove OPCMv1 from all Solidity code

op-chain-ops/interopgen/deploy.go

@@ -243,7 +243,7 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 		BasefeeScalar:                cfg.GasPriceOracleBaseFeeScalar,
 		BlobBaseFeeScalar:            cfg.GasPriceOracleBlobBaseFeeScalar,
 		L2ChainId:                    new(big.Int).SetUint64(cfg.L2ChainID),
-		Opcm:                         superDeployment.Opcm,
+		Opcm:                         superDeployment.OpcmV2,
 		SaltMixer:                    cfg.SaltMixer,
 		GasLimit:                     cfg.GasLimit,
 		DisputeGameType:              cfg.DisputeGameType,
@@ -273,39 +273,57 @@ func MigrateInterop(
 ) (*InteropDeployment, error) {
 	l2ChainIDs := maps.Keys(l2Deployments)
 	sort.Strings(l2ChainIDs)
-	chainConfigs := make([]manage.OPChainConfig, len(l2Deployments))
+
+	// We don't have a super root at genesis. But stub the starting anchor root anyways to facilitate super DG testing.
+	startingAnchorRoot := common.Hash(opcm.PermissionedGameStartingAnchorRoot)
+
+	// Build chain system config addresses for V2 migrate input.
+	chainSystemConfigs := make([]common.Address, len(l2Deployments))
 	for i, l2ChainID := range l2ChainIDs {
-		l2Deployment := l2Deployments[l2ChainID]
-		chainConfigs[i] = manage.OPChainConfig{
-			SystemConfigProxy:  l2Deployment.SystemConfigProxy,
-			CannonPrestate:     l2Cfgs[l2ChainID].DisputeAbsolutePrestate,
-			CannonKonaPrestate: l2Cfgs[l2ChainID].DisputeKonaAbsolutePrestate,
-		}
+		chainSystemConfigs[i] = l2Deployments[l2ChainID].SystemConfigProxy
 	}
 
-	// For now get the fault game parameters from the first chain
+	// ABI-encode the cannon prestates as game args (from the first chain config).
 	l2ChainID := l2ChainIDs[0]
-	// We don't have a super root at genesis. But stub the starting anchor root anyways to facilitate super DG testing.
-	startingAnchorRoot := common.Hash(opcm.PermissionedGameStartingAnchorRoot)
+	cannonGameArgs := common.LeftPadBytes(l2Cfgs[l2ChainID].DisputeAbsolutePrestate.Bytes(), 32)
+	cannonKonaGameArgs := common.LeftPadBytes(l2Cfgs[l2ChainID].DisputeKonaAbsolutePrestate.Bytes(), 32)
+
+	const (
+		GameTypeCannon          = uint32(0)
+		GameTypeSuperCannon     = uint32(4)
+		GameTypeSuperCannonKona = uint32(9)
+	)
+
 	imi := manage.InteropMigrationInput{
 		Prank: superCfg.ProxyAdminOwner,
-		Opcm:  superDeployment.Opcm,
-		MigrateInputV1: &manage.MigrateInputV1{
-			UsePermissionlessGame: true,
+		Opcm:  superDeployment.OpcmV2,
+		MigrateInputV2: &manage.MigrateInputV2{
+			ChainSystemConfigs: chainSystemConfigs,
+			DisputeGameConfigs: []manage.DisputeGameConfig{
+				{
+					Enabled:  true,
+					InitBond: big.NewInt(0),
+					GameType: GameTypeCannon,
+					GameArgs: cannonGameArgs,
+				},
+				{
+					Enabled:  true,
+					InitBond: big.NewInt(0),
+					GameType: GameTypeSuperCannon,
+					GameArgs: cannonGameArgs,
+				},
+				{
+					Enabled:  true,
+					InitBond: big.NewInt(0),
+					GameType: GameTypeSuperCannonKona,
+					GameArgs: cannonKonaGameArgs,
+				},
+			},
 			StartingAnchorRoot: manage.Proposal{
 				Root:             startingAnchorRoot,
 				L2SequenceNumber: big.NewInt(int64(l1GenesisTimestamp)),
 			},
-			GameParameters: manage.GameParameters{
-				Proposer:         l2Cfgs[l2ChainID].Proposer,
-				Challenger:       l2Cfgs[l2ChainID].Challenger,
-				MaxGameDepth:     l2Cfgs[l2ChainID].DisputeMaxGameDepth,
-				SplitDepth:       l2Cfgs[l2ChainID].DisputeSplitDepth,
-				InitBond:         big.NewInt(0),
-				ClockExtension:   l2Cfgs[l2ChainID].DisputeClockExtension,
-				MaxClockDuration: l2Cfgs[l2ChainID].DisputeMaxClockDuration,
-			},
-			OpChainConfigs: chainConfigs,
+			StartingRespectedGameType: GameTypeSuperCannon,
 		},
 	}
 	output, err := manage.Migrate(l1Host, imi)

op-deployer/pkg/deployer/bootstrap/implementations_test.go

@@ -97,9 +97,9 @@ func testImplementations(t *testing.T, forkRPCURL string) {
 	// Assert that addresses stay the same between runs
 	t.Log("Deploying first implementation contracts bundle")
 	deployment1 := deploy()
-	require.NotEqual(t, common.Address{}, deployment1.Opcm, "Opcm address should be set")
+	require.NotEqual(t, common.Address{}, deployment1.OpcmV2, "OpcmV2 address should be set")
 	t.Log("Deploying second implementation contracts bundle")
 	deployment2 := deploy()
-	require.NotEqual(t, common.Address{}, deployment2.Opcm, "Opcm address should be set")
+	require.NotEqual(t, common.Address{}, deployment2.OpcmV2, "OpcmV2 address should be set")
 	require.Equal(t, deployment1, deployment2)
 }

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

@@ -126,7 +126,8 @@ func TestEndToEndBootstrapApply(t *testing.T) {
 
 		intent, st := shared.NewIntent(t, l1ChainID, dk, l2ChainID, loc, loc, testCustomGasLimit)
 		intent.SuperchainRoles = nil
-		intent.OPCMAddress = &impls.Opcm
+		intent.OPCMAddress = &impls.OpcmV2
+		intent.SuperchainConfigProxy = &bstrap.SuperchainConfigProxy
 
 		require.NoError(t, deployer.ApplyPipeline(
 			ctx,
@@ -169,7 +170,7 @@ func TestEndToEndBootstrapApplyWithUpgrade(t *testing.T) {
 		name       string
 		devFeature common.Hash
 	}{
-		{"default", common.Hash{}},
+		// "default" (non-V2) test case removed: v1 OPCM was deleted.
 		{"opcm-v2", deployer.OPCMV2DevFlag},
 	}
 	for _, tt := range tests {
@@ -433,8 +434,9 @@ func TestEndToEndApply(t *testing.T) {
 		// Verify that the dev feature bitmap is set to OPCMV2
 		require.Equal(t, deployer.OPCMV2DevFlag, intent.GlobalDeployOverrides["devFeatureBitmap"])
 
-		// Assert that the OPCM V1 addresses are zero
-		require.Equal(t, common.Address{}, st.ImplementationsDeployment.OpcmImpl, "OPCM V1 implementation should be zero")
+		// OpcmImpl is populated with the v2 address for downstream compat (v1 deleted)
+		require.Equal(t, st.ImplementationsDeployment.OpcmV2Impl, st.ImplementationsDeployment.OpcmImpl, "OpcmImpl should equal OpcmV2Impl")
+		// V1 sub-contract addresses are zero (v1 deleted, deprecated output fields)
 		require.Equal(t, common.Address{}, st.ImplementationsDeployment.OpcmContractsContainerImpl, "OPCM container implementation should be zero")
 		require.Equal(t, common.Address{}, st.ImplementationsDeployment.OpcmGameTypeAdderImpl, "OPCM game type adder implementation should be zero")
 		require.Equal(t, common.Address{}, st.ImplementationsDeployment.OpcmDeployerImpl, "OPCM deployer implementation should be zero")
@@ -1176,7 +1178,7 @@ func validateSuperchainDeployment(t *testing.T, st *state.State, cg codeGetter,
 		{"SuperchainProxyAdminImpl", st.SuperchainDeployment.SuperchainProxyAdminImpl},
 		{"SuperchainConfigProxy", st.SuperchainDeployment.SuperchainConfigProxy},
 		{"ProtocolVersionsProxy", st.SuperchainDeployment.ProtocolVersionsProxy},
-		{"OpcmImpl", st.ImplementationsDeployment.OpcmImpl},
+		{"OpcmV2Impl", st.ImplementationsDeployment.OpcmV2Impl},
 		{"PreimageOracleImpl", st.ImplementationsDeployment.PreimageOracleImpl},
 		{"MipsImpl", st.ImplementationsDeployment.MipsImpl},
 	}

op-deployer/pkg/deployer/integration_test/cli/bootstrap_forge_test.go

@@ -115,7 +115,7 @@ func TestCLIBootstrapForge(t *testing.T) {
 		require.NoError(t, err)
 
 		// We only check specific addresses that are always set
-		require.NotEqual(t, common.Address{}, implsOutput.Opcm, "Opcm should be set")
+		require.NotEqual(t, common.Address{}, implsOutput.OpcmV2, "OpcmV2 should be set")
 		require.NotEqual(t, common.Address{}, implsOutput.OpcmStandardValidator, "OpcmStandardValidator should be set")
 		require.NotEqual(t, common.Address{}, implsOutput.DelayedWETHImpl, "DelayedWETHImpl should be set")
 		require.NotEqual(t, common.Address{}, implsOutput.OptimismPortalImpl, "OptimismPortalImpl should be set")
@@ -176,7 +176,7 @@ func TestCLIBootstrapForge(t *testing.T) {
 
 		// Verify all outputs have valid addresses
 		require.NoError(t, addresses.CheckNoZeroAddresses(superchainOutput))
-		require.NotEqual(t, common.Address{}, implsOutput.Opcm, "Opcm should be set")
+		require.NotEqual(t, common.Address{}, implsOutput.OpcmV2, "OpcmV2 should be set")
 
 		t.Log("✓ End-to-end bootstrap with Forge completed successfully")
 	})

op-deployer/pkg/deployer/integration_test/cli/bootstrap_test.go

@@ -183,7 +183,7 @@ func TestCLIBootstrap(t *testing.T) {
 		require.NoError(t, err)
 
 		// We only check specific addresses that are always set
-		require.NotEqual(t, common.Address{}, implsOutput.Opcm, "Opcm should be set")
+		require.NotEqual(t, common.Address{}, implsOutput.OpcmV2, "OpcmV2 should be set")
 		require.NotEqual(t, common.Address{}, implsOutput.OpcmStandardValidator, "OpcmStandardValidator should be set")
 		require.NotEqual(t, common.Address{}, implsOutput.DelayedWETHImpl, "DelayedWETHImpl should be set")
 		require.NotEqual(t, common.Address{}, implsOutput.OptimismPortalImpl, "OptimismPortalImpl should be set")

op-deployer/pkg/deployer/integration_test/cli/migrate_test.go

@@ -88,8 +88,10 @@ func TestCLIMigrateRequiredFlags(t *testing.T) {
 	})
 }
 
-// TestCLIMigrateV1 tests the migrate-v1 CLI command for OPCM v1
+// TestCLIMigrateV1 tests the migrate-v1 CLI command for OPCM v1.
+// Skipped: OPCMv1 contract has been deleted. Remove this test in the Go cleanup PR.
 func TestCLIMigrateV1(t *testing.T) {
+	t.Skip("OPCMv1 contract deleted — v1 migration path no longer functional")
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
 	forkedL1, stopL1, err := devnet.NewForkedSepolia(lgr)
@@ -154,8 +156,8 @@ func TestCLIMigrateV1(t *testing.T) {
 
 	impls, err := bootstrap.Implementations(ctx, cfg)
 	require.NoError(t, err, "Failed to deploy implementations")
-	require.NotEqual(t, common.Address{}, impls.Opcm, "OPCM V1 address should be set")
-	require.Equal(t, common.Address{}, impls.OpcmV2, "OPCM V2 address should be zero when V1 is deployed")
+	require.NotEqual(t, common.Address{}, impls.OpcmV2, "OPCM V2 address should be set")
+	require.Equal(t, common.Address{}, impls.Opcm, "OPCM V1 address should be zero (v1 deleted)")
 
 	// Set up a test chain
 	l1ChainID := uint64(11155111) // Sepolia chain ID
@@ -219,7 +221,8 @@ func TestCLIMigrateV1(t *testing.T) {
 	// Set implementations deployment addresses
 	if st.ImplementationsDeployment == nil {
 		st.ImplementationsDeployment = &addresses.ImplementationsContracts{
-			OpcmImpl:                         impls.Opcm,
+			OpcmImpl:                         impls.OpcmV2, // v1 deleted; populate with v2 for downstream compat
+			OpcmV2Impl:                       impls.OpcmV2,
 			OptimismPortalImpl:               impls.OptimismPortalImpl,
 			DelayedWethImpl:                  impls.DelayedWETHImpl,
 			EthLockboxImpl:                   impls.ETHLockboxImpl,
@@ -439,7 +442,8 @@ func TestCLIMigrateV2(t *testing.T) {
 	// Set implementations deployment addresses
 	if st.ImplementationsDeployment == nil {
 		st.ImplementationsDeployment = &addresses.ImplementationsContracts{
-			OpcmImpl:                         impls.OpcmV2,
+			OpcmImpl:                         impls.OpcmV2, // v1 deleted; populate with v2 for downstream compat
+			OpcmV2Impl:                       impls.OpcmV2,
 			OpcmContainerImpl:                impls.OpcmContainer,
 			OpcmUtilsImpl:                    impls.OpcmUtils,
 			OpcmMigratorImpl:                 impls.OpcmMigrator,

op-deployer/pkg/deployer/integration_test/cli/upgrade_test.go

@@ -9,11 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/opcmregistry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/v2_0_0"
-	v6_0_0 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/v6_0_0"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum-optimism/optimism/op-service/testutils/devnet"
 	"github.com/ethereum/go-ethereum/common"
@@ -61,11 +59,8 @@ func TestCLIUpgrade(t *testing.T) {
 			version:     "v5.0.0",
 			forkBlock:   9629972, // one block past the opcm deployment block
 		},
-		{
-			contractTag: standard.ContractsV600Tag,
-			version:     "v6.0.0-rc.2",
-			forkBlock:   10101510, // one block past the opcm deployment block
-		},
+		// v6.0.0-rc.2 test case removed: it deployed a v1 OPCM on Sepolia, and the
+		// embedded UpgradeOPChain.s.sol script no longer supports v1 OPCM upgrades.
 	}
 
 	for _, tc := range testCases {
@@ -82,41 +77,18 @@ func TestCLIUpgrade(t *testing.T) {
 			opcm, err := standard.OPCMImplAddressFor(11155111, tc.contractTag)
 			require.NoError(t, err)
 
-			versionStr := strings.TrimPrefix(tc.version, "v") // Remove "v" prefix for parsing
-			version, err := opcmregistry.ParseSemver(versionStr)
-			require.NoError(t, err, "failed to parse version %s", versionStr)
-
-			v6Semver := opcmregistry.Semver{Major: 6, Minor: 0, Patch: 0}
-			var configData []byte
-			if version.Compare(v6Semver) >= 0 {
-				// v6.0.0+ uses a different input structure
-				testConfig := v6_0_0.UpgradeOPChainInput{
-					Prank: l1ProxyAdminOwner,
-					Opcm:  opcm,
-					EncodedChainConfigs: []v6_0_0.OPChainConfig{
-						{
-							SystemConfigProxy:  systemConfigProxy,
-							CannonPrestate:     common.HexToHash("0x0abc"),
-							CannonKonaPrestate: common.HexToHash("0x0def"),
-						},
+			testConfig := v2_0_0.UpgradeOPChainInput{
+				Prank: l1ProxyAdminOwner,
+				Opcm:  opcm,
+				EncodedChainConfigs: []v2_0_0.OPChainConfig{
+					{
+						SystemConfigProxy: systemConfigProxy,
+						ProxyAdmin:        proxyAdminImpl,
+						AbsolutePrestate:  common.HexToHash("0x0abc"),
 					},
-				}
-				configData, err = json.MarshalIndent(testConfig, "", "  ")
-			} else {
-				// Older versions use v2_0_0 structure
-				testConfig := v2_0_0.UpgradeOPChainInput{
-					Prank: l1ProxyAdminOwner,
-					Opcm:  opcm,
-					EncodedChainConfigs: []v2_0_0.OPChainConfig{
-						{
-							SystemConfigProxy: systemConfigProxy,
-							ProxyAdmin:        proxyAdminImpl,
-							AbsolutePrestate:  common.HexToHash("0x0abc"),
-						},
-					},
-				}
-				configData, err = json.MarshalIndent(testConfig, "", "  ")
+				},
 			}
+			configData, err := json.MarshalIndent(testConfig, "", "  ")
 			require.NoError(t, err)
 
 			configFile := filepath.Join(workDir, "upgrade_config_"+tc.version+".json")
@@ -148,14 +120,7 @@ func TestCLIUpgrade(t *testing.T) {
 			require.Equal(t, l1ProxyAdminOwner.Hex(), dump[0].To.Hex())
 			dataHex := hex.EncodeToString(dump[0].Data)
 
-			// v6.0.0+ uses a different function signature: upgrade((address,bytes32,bytes32)[])
-			// Older versions use: upgrade((address,address,bytes32)[])
-			var expectedSelector string
-			if version.Compare(v6Semver) >= 0 {
-				expectedSelector = "cbeda5a7" // upgrade((address,bytes32,bytes32)[])
-			} else {
-				expectedSelector = "ff2dd5a1" // upgrade((address,address,bytes32)[])
-			}
+			expectedSelector := "ff2dd5a1"
 			require.True(t, strings.HasPrefix(dataHex, expectedSelector),
 				"calldata should have opcm.upgrade fcn selector %s, got: %s", expectedSelector, dataHex[:8])
 		})

op-deployer/pkg/deployer/integration_test/cli/verify_test.go

@@ -150,7 +150,7 @@ func TestCLIVerify(t *testing.T) {
 			"superchain_superchain_config_proxy": "Proxy.sol/Proxy.json",
 			"superchain_protocol_versions_proxy": "Proxy.sol/Proxy.json",
 			"superchain_superchain_config_impl":  "SuperchainConfig.sol/SuperchainConfig.json",
-			"implementations_opcm_impl":          "OPContractsManager.sol/OPContractsManager.json",
+			"implementations_opcm_impl":          "OPContractsManagerV2.sol/OPContractsManagerV2.json",
 			"regular_contract_name":              "RegularContractName.sol/RegularContractName.json",
 		}
 

op-deployer/pkg/deployer/manage/add_game_type_test.go

@@ -25,6 +25,7 @@ import (
 )
 
 func TestAddGameType(t *testing.T) {
+	t.Skip("OPCMv1 contract deleted — AddGameType.s.sol no longer exists. Use TestManageAddGameTypeV2_CLI instead.")
 	// Since the opcm version is not yet on sepolia, we create a fork of sepolia then deploy the opcm via deploy implementations.
 	lgr := testlog.Logger(t, slog.LevelDebug)
 	forkedL1, stopL1, err := devnet.NewForkedSepolia(lgr)

op-deployer/pkg/deployer/manage/migrate_test.go

@@ -53,7 +53,6 @@ func TestInteropMigration(t *testing.T) {
 		name       string
 		devFeature common.Hash
 	}{
-		{"opcm-v1", common.Hash{}},
 		{"opcm-v2", deployer.OPCMV2DevFlag},
 	}
 

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

@@ -83,7 +83,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 	}
 
 	st.ImplementationsDeployment = &addresses.ImplementationsContracts{
-		OpcmImpl:                         dio.Opcm,
+		OpcmImpl:                         dio.OpcmV2, // v1 deleted; populate with v2 for downstream compat
 		OpcmGameTypeAdderImpl:            dio.OpcmGameTypeAdder,
 		OpcmDeployerImpl:                 dio.OpcmDeployer,
 		OpcmUpgraderImpl:                 dio.OpcmUpgrader,

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

@@ -44,10 +44,15 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 			superchainConfigAddr = *intent.SuperchainConfigProxy
 		}
 
-		// The ReadSuperchainDeployment script (packages/contracts-bedrock/scripts/deploy/ReadSuperchainDeployment.s.sol)
-		// uses the OPCM's semver version (>= 7.0.0 indicates v2) to determine how to populate the superchain state:
-		// - OPCMv1 (< 7.0.0): Queries the OPCM contract to get SuperchainConfig and ProtocolVersions
-		// - OPCMv2 (>= 7.0.0): Uses the provided SuperchainConfigProxy address; ProtocolVersions is deprecated
+		// If only an OPCM address is provided, resolve SuperchainConfigProxy from it on-chain.
+		if superchainConfigAddr == (common.Address{}) && opcmAddr != (common.Address{}) {
+			opcmContract := opcm.NewContract(opcmAddr, env.L1Client)
+			resolved, err := opcmContract.SuperchainConfig(ctx)
+			if err != nil {
+				return fmt.Errorf("error resolving SuperchainConfig from OPCM at %s: %w", opcmAddr, err)
+			}
+			superchainConfigAddr = resolved
+		}
 		superDeployment, superRoles, err := PopulateSuperchainState(env, opcmAddr, superchainConfigAddr)
 		if err != nil {
 			return fmt.Errorf("error populating superchain state: %w", err)
@@ -57,7 +62,8 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 
 		if hasPredeployedOPCM && st.ImplementationsDeployment == nil {
 			st.ImplementationsDeployment = &addresses.ImplementationsContracts{
-				OpcmImpl: opcmAddr,
+				OpcmImpl:   opcmAddr,
+				OpcmV2Impl: opcmAddr,
 			}
 		}
 	}