opcm-redesign: op-deployer changes

op-chain-ops/interopgen/configs.go

@@ -35,7 +35,7 @@ type SuperFaultProofConfig struct {
 }
 
 type OPCMImplementationsConfig struct {
-	Release string
+	L1ContractsRelease string
 
 	FaultProof SuperFaultProofConfig
 

op-chain-ops/interopgen/deploy.go

@@ -170,10 +170,9 @@ func DeploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*Sup
 		ProofMaturityDelaySeconds:       superCfg.Implementations.FaultProof.ProofMaturityDelaySeconds,
 		DisputeGameFinalityDelaySeconds: superCfg.Implementations.FaultProof.DisputeGameFinalityDelaySeconds,
 		MipsVersion:                     superCfg.Implementations.FaultProof.MipsVersion,
-		Release:                         superCfg.Implementations.Release,
+		L1ContractsRelease:              superCfg.Implementations.L1ContractsRelease,
 		SuperchainConfigProxy:           superDeployment.SuperchainConfigProxy,
 		ProtocolVersionsProxy:           superDeployment.ProtocolVersionsProxy,
-		OpcmProxyOwner:                  superDeployment.SuperchainProxyAdmin,
 		UseInterop:                      superCfg.Implementations.UseInterop,
 		StandardVersionsToml:            standard.VersionsMainnetData,
 	})
@@ -210,7 +209,7 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 		BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
 		BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
 		L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
-		OpcmProxy:               superDeployment.OpcmProxy,
+		Opcm:                    superDeployment.Opcm,
 		SaltMixer:               cfg.SaltMixer,
 		GasLimit:                cfg.GasLimit,
 		DisputeGameType:         cfg.DisputeGameType,

op-chain-ops/interopgen/deployments.go

@@ -9,8 +9,7 @@ type L1Deployment struct {
 }
 
 type Implementations struct {
-	OpcmProxy                        common.Address `json:"OPCMProxy"`
-	OpcmImpl                         common.Address `json:"OPCMImpl"`
+	Opcm                             common.Address `json:"OPCM"`
 	DelayedWETHImpl                  common.Address `json:"DelayedWETHImpl"`
 	OptimismPortalImpl               common.Address `json:"OptimismPortalImpl"`
 	PreimageOracleSingleton          common.Address `json:"PreimageOracleSingleton"`

op-chain-ops/interopgen/recipe.go

@@ -69,7 +69,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
 		ProtocolVersionsOwner: superchainProtocolVersionsOwner,
 		Deployer:              superchainDeployer,
 		Implementations: OPCMImplementationsConfig{
-			Release: "dev",
+			L1ContractsRelease: "dev",
 			FaultProof: SuperFaultProofConfig{
 				WithdrawalDelaySeconds:          big.NewInt(604800),
 				MinProposalSizeBytes:            big.NewInt(10000),

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

@@ -164,10 +164,6 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 	if err != nil {
 		return fmt.Errorf("error getting standard versions TOML: %w", err)
 	}
-	opcmProxyOwnerAddr, err := standard.ManagerOwnerAddrFor(chainIDU64)
-	if err != nil {
-		return fmt.Errorf("error getting superchain proxy admin: %w", err)
-	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
 	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
@@ -199,14 +195,14 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 	}
 	host.SetNonce(chainDeployer, nonce)
 
-	var release string
+	var l1ContractsRelease string
 	if cfg.ArtifactsLocator.IsTag() {
-		release = cfg.ArtifactsLocator.Tag
+		l1ContractsRelease = cfg.ArtifactsLocator.Tag
 	} else {
-		release = "dev"
+		l1ContractsRelease = "dev"
 	}
 
-	lgr.Info("deploying OPCM", "release", release)
+	lgr.Info("deploying OPCM", "l1ContractsRelease", l1ContractsRelease)
 
 	// We need to etch the Superchain addresses so that they have nonzero code
 	// and the checks in the OPCM constructor pass.
@@ -238,10 +234,9 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(cfg.ProofMaturityDelaySeconds),
 			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(cfg.DisputeGameFinalityDelaySeconds),
 			MipsVersion:                     new(big.Int).SetUint64(cfg.MIPSVersion),
-			Release:                         release,
+			L1ContractsRelease:              l1ContractsRelease,
 			SuperchainConfigProxy:           superchainConfigAddr,
 			ProtocolVersionsProxy:           protocolVersionsAddr,
-			OpcmProxyOwner:                  opcmProxyOwnerAddr,
 			StandardVersionsToml:            standardVersionsTOML,
 			UseInterop:                      false,
 		},

op-deployer/pkg/deployer/inspect/l1.go

@@ -45,7 +45,7 @@ type OpChainDeployment struct {
 }
 
 type ImplementationsDeployment struct {
-	OpcmProxyAddress                        common.Address `json:"opcmProxyAddress"`
+	OpcmAddress                             common.Address `json:"opcmAddress"`
 	DelayedWETHImplAddress                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImplAddress               common.Address `json:"optimismPortalImplAddress"`
 	PreimageOracleSingletonAddress          common.Address `json:"preimageOracleSingletonAddress"`
@@ -113,7 +113,7 @@ func L1(globalState *state.State, chainID common.Hash) (*L1Contracts, error) {
 			// DelayedWETHPermissionlessGameProxyAddress: chainState.DelayedWETHPermissionlessGameProxyAddress,
 		},
 		ImplementationsDeployment: ImplementationsDeployment{
-			OpcmProxyAddress:                        globalState.ImplementationsDeployment.OpcmProxyAddress,
+			OpcmAddress:                             globalState.ImplementationsDeployment.OpcmAddress,
 			DelayedWETHImplAddress:                  globalState.ImplementationsDeployment.DelayedWETHImplAddress,
 			OptimismPortalImplAddress:               globalState.ImplementationsDeployment.OptimismPortalImplAddress,
 			PreimageOracleSingletonAddress:          globalState.ImplementationsDeployment.PreimageOracleSingletonAddress,

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

@@ -207,6 +207,30 @@ func TestApplyExistingOPCM(t *testing.T) {
 	))
 
 	validateOPChainDeployment(t, ethClientCodeGetter(ctx, l1Client), st, intent)
+
+	releases := standard.L1VersionsSepolia.Releases["op-contracts/v1.6.0"]
+
+	implTests := []struct {
+		name    string
+		expAddr common.Address
+		actAddr common.Address
+	}{
+		{"OptimismPortal", releases.OptimismPortal.ImplementationAddress, st.ImplementationsDeployment.OptimismPortalImplAddress},
+		{"SystemConfig,", releases.SystemConfig.ImplementationAddress, st.ImplementationsDeployment.SystemConfigImplAddress},
+		{"L1CrossDomainMessenger", releases.L1CrossDomainMessenger.ImplementationAddress, st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress},
+		{"L1ERC721Bridge", releases.L1ERC721Bridge.ImplementationAddress, st.ImplementationsDeployment.L1ERC721BridgeImplAddress},
+		{"L1StandardBridge", releases.L1StandardBridge.ImplementationAddress, st.ImplementationsDeployment.L1StandardBridgeImplAddress},
+		{"OptimismMintableERC20Factory", releases.OptimismMintableERC20Factory.ImplementationAddress, st.ImplementationsDeployment.OptimismMintableERC20FactoryImplAddress},
+		{"DisputeGameFactory", releases.DisputeGameFactory.ImplementationAddress, st.ImplementationsDeployment.DisputeGameFactoryImplAddress},
+		{"MIPS", releases.MIPS.Address, st.ImplementationsDeployment.MipsSingletonAddress},
+		{"PreimageOracle", releases.PreimageOracle.Address, st.ImplementationsDeployment.PreimageOracleSingletonAddress},
+		{"DelayedWETH", releases.DelayedWETH.ImplementationAddress, st.ImplementationsDeployment.DelayedWETHImplAddress},
+	}
+	for _, tt := range implTests {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.expAddr, tt.actAddr)
+		})
+	}
 }
 
 func TestL2BlockTimeOverride(t *testing.T) {
@@ -571,7 +595,7 @@ func validateSuperchainDeployment(t *testing.T, st *state.State, cg codeGetter)
 		{"SuperchainConfigImpl", st.SuperchainDeployment.SuperchainConfigImplAddress},
 		{"ProtocolVersionsProxy", st.SuperchainDeployment.ProtocolVersionsProxyAddress},
 		{"ProtocolVersionsImpl", st.SuperchainDeployment.ProtocolVersionsImplAddress},
-		{"OpcmProxy", st.ImplementationsDeployment.OpcmProxyAddress},
+		{"Opcm", st.ImplementationsDeployment.OpcmAddress},
 		{"PreimageOracleSingleton", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
 		{"MipsSingleton", st.ImplementationsDeployment.MipsSingletonAddress},
 	}

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

@@ -48,57 +48,6 @@ func (c *Contract) GenericAddressGetter(ctx context.Context, functionName string
 	return c.callContractMethod(ctx, functionName, abi.Arguments{})
 }
 
-// GetImplementation retrieves the Implementation struct for a given release and contract name.
-func (c *Contract) GetOPCMImplementationAddress(ctx context.Context, release, contractName string) (common.Address, error) {
-	methodName := "implementations"
-	method := abi.NewMethod(
-		methodName,
-		methodName,
-		abi.Function,
-		"view",
-		true,
-		false,
-		abi.Arguments{
-			{Name: "release", Type: mustType("string")},
-			{Name: "contractName", Type: mustType("string")},
-		},
-		abi.Arguments{
-			{Name: "logic", Type: mustType("address")},
-			{Name: "initializer", Type: mustType("bytes4")},
-		},
-	)
-
-	calldata, err := method.Inputs.Pack(release, contractName)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to pack inputs: %w", err)
-	}
-
-	msg := ethereum.CallMsg{
-		To:   &c.addr,
-		Data: append(bytes.Clone(method.ID), calldata...),
-	}
-
-	result, err := c.client.CallContract(ctx, msg, nil)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to call contract: %w", err)
-	}
-
-	out, err := method.Outputs.Unpack(result)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to unpack result: %w", err)
-	}
-	if len(out) != 2 {
-		return common.Address{}, fmt.Errorf("unexpected output length: %d", len(out))
-	}
-
-	logic, ok := out[0].(common.Address)
-	if !ok {
-		return common.Address{}, fmt.Errorf("unexpected type for logic: %T", out[0])
-	}
-
-	return logic, nil
-}
-
 func (c *Contract) callContractMethod(ctx context.Context, methodName string, inputs abi.Arguments, args ...interface{}) (common.Address, error) {
 	method := abi.NewMethod(
 		methodName,

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

@@ -18,12 +18,11 @@ type DeployImplementationsInput struct {
 	DisputeGameFinalityDelaySeconds *big.Int
 	MipsVersion                     *big.Int
 	// Release version to set OPCM implementations for, of the format `op-contracts/vX.Y.Z`.
-	Release               string
+	L1ContractsRelease    string
 	SuperchainConfigProxy common.Address
 	ProtocolVersionsProxy common.Address
 	UseInterop            bool // if true, deploy Interop implementations
 
-	OpcmProxyOwner       common.Address
 	StandardVersionsToml string // contents of 'standard-versions-mainnet.toml' or 'standard-versions-sepolia.toml' file
 }
 
@@ -32,8 +31,7 @@ func (input *DeployImplementationsInput) InputSet() bool {
 }
 
 type DeployImplementationsOutput struct {
-	OpcmProxy                        common.Address
-	OpcmImpl                         common.Address
+	Opcm                             common.Address
 	DelayedWETHImpl                  common.Address
 	OptimismPortalImpl               common.Address
 	PreimageOracleSingleton          common.Address

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

@@ -26,7 +26,7 @@ type DeployOPChainInputV160 struct {
 	BasefeeScalar     uint32
 	BlobBaseFeeScalar uint32
 	L2ChainId         *big.Int
-	OpcmProxy         common.Address
+	Opcm              common.Address
 	SaltMixer         string
 	GasLimit          uint64
 
@@ -122,8 +122,8 @@ func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, erro
 
 type ReadImplementationAddressesInput struct {
 	DeployOPChainOutput
-	OpcmProxy common.Address
-	Release   string
+	Opcm    common.Address
+	Release string
 }
 
 type ReadImplementationAddressesOutput struct {

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

@@ -31,7 +31,7 @@ func DeployAltDA(env *Env, intent *state.Intent, st *state.State, chainID common
 	lgr.Info("deploying alt-da contracts")
 	dao, err = opcm.DeployAltDA(env.L1ScriptHost, opcm.DeployAltDAInput{
 		Salt:                     st.Create2Salt,
-		ProxyAdmin:               st.ImplementationsDeployment.OpcmProxyAddress,
+		ProxyAdmin:               chainState.ProxyAdminAddress,
 		ChallengeContractOwner:   chainIntent.Roles.L1ProxyAdminOwner,
 		ChallengeWindow:          new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAChallengeWindow),
 		ResolveWindow:            new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAResolveWindow),

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

@@ -68,10 +68,9 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(proofParams.ProofMaturityDelaySeconds),
 			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(proofParams.DisputeGameFinalityDelaySeconds),
 			MipsVersion:                     new(big.Int).SetUint64(proofParams.MIPSVersion),
-			Release:                         contractsRelease,
+			L1ContractsRelease:              contractsRelease,
 			SuperchainConfigProxy:           st.SuperchainDeployment.SuperchainConfigProxyAddress,
 			ProtocolVersionsProxy:           st.SuperchainDeployment.ProtocolVersionsProxyAddress,
-			OpcmProxyOwner:                  st.SuperchainDeployment.ProxyAdminAddress,
 			StandardVersionsToml:            standardVersionsTOML,
 			UseInterop:                      intent.UseInterop,
 		},
@@ -81,7 +80,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 	}
 
 	st.ImplementationsDeployment = &state.ImplementationsDeployment{
-		OpcmProxyAddress:                        dio.OpcmProxy,
+		OpcmAddress:                             dio.Opcm,
 		DelayedWETHImplAddress:                  dio.DelayedWETHImpl,
 		OptimismPortalImplAddress:               dio.OptimismPortalImpl,
 		PreimageOracleSingletonAddress:          dio.PreimageOracleSingleton,

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

@@ -45,12 +45,12 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 			SuperchainConfigProxyAddress: common.Address(*superCfg.Config.SuperchainConfigAddr),
 		}
 
-		opcmProxy, err := standard.ManagerImplementationAddrFor(intent.L1ChainID)
+		opcmAddress, err := standard.ManagerImplementationAddrFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting OPCM proxy address: %w", err)
 		}
 		st.ImplementationsDeployment = &state.ImplementationsDeployment{
-			OpcmProxyAddress: opcmProxy,
+			OpcmAddress: opcmAddress,
 		}
 	}
 

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

@@ -34,7 +34,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
 			}
 
-			opcmAddr = input.OpcmProxy
+			opcmAddr = input.Opcm
 			return opcm.DeployOPChainV160(env.L1ScriptHost, input)
 		}
 	default:
@@ -44,7 +44,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
 			}
 
-			opcmAddr = input.OpcmProxy
+			opcmAddr = input.Opcm
 			return opcm.DeployOPChainIsthmus(env.L1ScriptHost, input)
 		}
 	}
@@ -67,7 +67,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 
 	readInput := opcm.ReadImplementationAddressesInput{
 		DeployOPChainOutput: dco,
-		OpcmProxy:           opcmAddr,
+		Opcm:                opcmAddr,
 		Release:             release,
 	}
 	impls, err := opcm.ReadImplementationAddresses(env.L1ScriptHost, readInput)
@@ -126,7 +126,7 @@ func makeDCIV160(intent *state.Intent, thisIntent *state.ChainIntent, chainID co
 		BasefeeScalar:                standard.BasefeeScalar,
 		BlobBaseFeeScalar:            standard.BlobBaseFeeScalar,
 		L2ChainId:                    chainID.Big(),
-		OpcmProxy:                    st.ImplementationsDeployment.OpcmProxyAddress,
+		Opcm:                         st.ImplementationsDeployment.OpcmAddress,
 		SaltMixer:                    st.Create2Salt.String(), // passing through salt generated at state initialization
 		GasLimit:                     standard.GasLimit,
 		DisputeGameType:              proofParams.DisputeGameType,

op-deployer/pkg/deployer/standard/standard.go

@@ -134,10 +134,11 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 	switch chainID {
 	case 1:
 		// Generated using the bootstrap command on 10/18/2024.
-		return common.HexToAddress("0x18cec91779995ad14c880e4095456b9147160790"), nil
+		// TODO: @blmalone this needs re-bootstrapped because it's still proxied
+		return common.HexToAddress(""), nil
 	case 11155111:
-		// Generated using the bootstrap command on 10/18/2024.
-		return common.HexToAddress("0xf564eea7960ea244bfebcbbb17858748606147bf"), nil
+		// Generated using the bootstrap command on 11/15/2024.
+		return common.HexToAddress("0xde9eacb994a6eb12997445f8a63a22772c5c4313"), nil
 	default:
 		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
 	}
@@ -172,7 +173,7 @@ func SystemOwnerAddrFor(chainID uint64) (common.Address, error) {
 func ArtifactsURLForTag(tag string) (*url.URL, error) {
 	switch tag {
 	case "op-contracts/v1.6.0":
-		return url.Parse(standardArtifactsURL("3a27c6dc0cb61b36feaac26def98c64b4a48ec8f5c5ba6965e8ae3157606043c"))
+		return url.Parse(standardArtifactsURL("e1f0c4020618c4a98972e7124c39686cab2e31d5d7846f9ce5e0d5eed0f5ff32"))
 	case "op-contracts/v1.7.0-beta.1+l2-contracts":
 		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
 	default:

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

@@ -64,7 +64,7 @@ type SuperchainDeployment struct {
 }
 
 type ImplementationsDeployment struct {
-	OpcmProxyAddress                        common.Address `json:"opcmProxyAddress"`
+	OpcmAddress                             common.Address `json:"opcmAddress"`
 	DelayedWETHImplAddress                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImplAddress               common.Address `json:"optimismPortalImplAddress"`
 	PreimageOracleSingletonAddress          common.Address `json:"preimageOracleSingletonAddress"`

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

@@ -146,6 +146,9 @@ contract ReadImplementationAddresses is Script {
         address mipsLogic = _rii.opcm().implementations().mipsImpl;
         _rio.set(_rio.mipsSingleton.selector, mipsLogic);
 
+        address delayedWETH = _rii.opcm().implementations().delayedWETHImpl;
+        _rio.set(_rio.delayedWETH.selector, delayedWETH);
+
         IAddressManager am = _rii.addressManager();
         _rio.set(_rio.l1CrossDomainMessenger.selector, am.getAddress("OVM_L1CrossDomainMessenger"));
 

packages/contracts-bedrock/snapshots/semver-lock.json

@@ -20,8 +20,8 @@
     "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xf0e6fd6810d1486163dc4ace0ed969b28b460e6c0f382d74133afea236ec36b5",
-    "sourceCodeHash": "0xf68453af197b59607a1a2fee6309fac167e69b8f847f445a744bd974ad2feddf"
+    "initCodeHash": "0xd038cc35325d023499151264232d75fa4ecc81f04a8c8353e6b50c43af224d6e",
+    "sourceCodeHash": "0xa13f3ab2b8744015290dbabe5f20fdd44774607e6a7ad3e5e016303fc4aa8c12"
   },
   "src/L1/OptimismPortal.sol": {
     "initCodeHash": "0x152167cfa18635ae4918a6eb3371a599cfa084418c0a652799cdb48bfc0ee0cc",