rename: OPStackManager -> OPContractsManager

op-chain-ops/Makefile

@@ -46,6 +46,6 @@ fuzz:
 
 
 sync-standard-version:
-	curl -Lo ./deployer/opsm/standard-versions.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions.toml
+	curl -Lo ./deployer/opcm/standard-versions.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions.toml
 
 .PHONY: test fuzz op-deployer sync-standard-version

op-chain-ops/deployer/integration_test/apply_test.go

@@ -151,7 +151,7 @@ func TestEndToEndApply(t *testing.T) {
 		{"SuperchainConfigImpl", st.SuperchainDeployment.SuperchainConfigImplAddress},
 		{"ProtocolVersionsProxy", st.SuperchainDeployment.ProtocolVersionsProxyAddress},
 		{"ProtocolVersionsImpl", st.SuperchainDeployment.ProtocolVersionsImplAddress},
-		{"OpsmProxy", st.ImplementationsDeployment.OpsmProxyAddress},
+		{"OpcmProxy", st.ImplementationsDeployment.OpcmProxyAddress},
 		{"DelayedWETHImpl", st.ImplementationsDeployment.DelayedWETHImplAddress},
 		{"OptimismPortalImpl", st.ImplementationsDeployment.OptimismPortalImplAddress},
 		{"PreimageOracleSingleton", st.ImplementationsDeployment.PreimageOracleSingletonAddress},

op-chain-ops/deployer/opsm/implementations.go → op-chain-ops/deployer/opcm/implementations.go

@@ -1,4 +1,4 @@
-package opsm
+package opcm
 
 import (
 	"fmt"
@@ -16,7 +16,7 @@ type DeployImplementationsInput struct {
 	ChallengePeriodSeconds          *big.Int
 	ProofMaturityDelaySeconds       *big.Int
 	DisputeGameFinalityDelaySeconds *big.Int
-	// Release version to set OPSM implementations for, of the format `op-contracts/vX.Y.Z`.
+	// Release version to set OPCM implementations for, of the format `op-contracts/vX.Y.Z`.
 	Release               string
 	SuperchainConfigProxy common.Address
 	ProtocolVersionsProxy common.Address
@@ -31,8 +31,8 @@ func (input *DeployImplementationsInput) InputSet() bool {
 }
 
 type DeployImplementationsOutput struct {
-	OpsmProxy                        common.Address
-	OpsmImpl                         common.Address
+	OpcmProxy                        common.Address
+	OpcmImpl                         common.Address
 	DelayedWETHImpl                  common.Address
 	OptimismPortalImpl               common.Address
 	PreimageOracleSingleton          common.Address
@@ -84,12 +84,12 @@ func DeployImplementations(
 	}
 	defer cleanupDeploy()
 
-	opsmContract := "OPStackManager"
+	opcmContract := "OPContractsManager"
 	if input.UseInterop {
-		opsmContract = "OPStackManagerInterop"
+		opcmContract = "OPContractsManagerInterop"
 	}
-	if err := host.RememberOnLabel("OPStackManager", opsmContract+".sol", opsmContract); err != nil {
-		return output, fmt.Errorf("failed to link OPStackManager label: %w", err)
+	if err := host.RememberOnLabel("OPContractsManager", opcmContract+".sol", opcmContract); err != nil {
+		return output, fmt.Errorf("failed to link OPContractsManager label: %w", err)
 	}
 
 	// So we can see in detail where the SystemConfig interop initializer fails

op-chain-ops/deployer/opsm/l2genesis.go → op-chain-ops/deployer/opcm/l2genesis.go

@@ -1,4 +1,4 @@
-package opsm
+package opcm
 
 import (
 	"fmt"

op-chain-ops/deployer/opsm/opchain.go → op-chain-ops/deployer/opcm/opchain.go

@@ -1,4 +1,4 @@
-package opsm
+package opcm
 
 import (
 	"fmt"
@@ -26,7 +26,7 @@ type DeployOPChainInput struct {
 	BasefeeScalar     uint32
 	BlobBaseFeeScalar uint32
 	L2ChainId         *big.Int
-	OpsmProxy         common.Address
+	OpcmProxy         common.Address
 }
 
 func (input *DeployOPChainInput) InputSet() bool {

op-chain-ops/deployer/opsm/standard.go → op-chain-ops/deployer/opcm/standard.go

@@ -1,4 +1,4 @@
-package opsm
+package opcm
 
 import "embed"
 

op-chain-ops/deployer/opsm/superchain.go → op-chain-ops/deployer/opcm/superchain.go

@@ -1,4 +1,4 @@
-package opsm
+package opcm
 
 import (
 	"fmt"

op-chain-ops/deployer/pipeline/implementations.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opsm"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/state"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -22,7 +22,7 @@ func DeployImplementations(ctx context.Context, env *Env, artifactsFS foundry.St
 	lgr.Info("deploying implementations")
 
 	var dump *foundry.ForgeAllocs
-	var dio opsm.DeployImplementationsOutput
+	var dio opcm.DeployImplementationsOutput
 	var err error
 	err = CallScriptBroadcast(
 		ctx,
@@ -37,9 +37,9 @@ func DeployImplementations(ctx context.Context, env *Env, artifactsFS foundry.St
 			Handler: func(host *script.Host) error {
 				host.SetEnvVar("IMPL_SALT", st.Create2Salt.Hex()[2:])
 				host.ImportState(st.SuperchainDeployment.StateDump)
-				dio, err = opsm.DeployImplementations(
+				dio, err = opcm.DeployImplementations(
 					host,
-					opsm.DeployImplementationsInput{
+					opcm.DeployImplementationsInput{
 						Salt:                            st.Create2Salt,
 						WithdrawalDelaySeconds:          big.NewInt(604800),
 						MinProposalSizeBytes:            big.NewInt(126000),
@@ -50,7 +50,7 @@ func DeployImplementations(ctx context.Context, env *Env, artifactsFS foundry.St
 						SuperchainConfigProxy:           st.SuperchainDeployment.SuperchainConfigProxyAddress,
 						ProtocolVersionsProxy:           st.SuperchainDeployment.ProtocolVersionsProxyAddress,
 						SuperchainProxyAdmin:            st.SuperchainDeployment.ProxyAdminAddress,
-						StandardVersionsToml:            opsm.StandardVersionsData,
+						StandardVersionsToml:            opcm.StandardVersionsData,
 						UseInterop:                      false,
 					},
 				)
@@ -70,7 +70,7 @@ func DeployImplementations(ctx context.Context, env *Env, artifactsFS foundry.St
 	}
 
 	st.ImplementationsDeployment = &state.ImplementationsDeployment{
-		OpsmProxyAddress:                        dio.OpsmProxy,
+		OpcmProxyAddress:                        dio.OpcmProxy,
 		DelayedWETHImplAddress:                  dio.DelayedWETHImpl,
 		OptimismPortalImplAddress:               dio.OptimismPortalImpl,
 		PreimageOracleSingletonAddress:          dio.PreimageOracleSingleton,

op-chain-ops/deployer/pipeline/l2genesis.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opsm"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/state"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -47,8 +47,8 @@ func GenerateL2Genesis(ctx context.Context, env *Env, artifactsFS foundry.StatDi
 			Client:      env.L1Client,
 			Broadcaster: DiscardBroadcaster,
 			Handler: func(host *script.Host) error {
-				err := opsm.L2Genesis(host, &opsm.L2GenesisInput{
-					L1Deployments: opsm.L1Deployments{
+				err := opcm.L2Genesis(host, &opcm.L2GenesisInput{
+					L1Deployments: opcm.L1Deployments{
 						L1CrossDomainMessengerProxy: thisChainState.L1CrossDomainMessengerProxyAddress,
 						L1StandardBridgeProxy:       thisChainState.L1StandardBridgeProxyAddress,
 						L1ERC721BridgeProxy:         thisChainState.L1ERC721BridgeProxyAddress,

op-chain-ops/deployer/pipeline/opchain.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opsm"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/state"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -27,7 +27,7 @@ func DeployOPChain(ctx context.Context, env *Env, artifactsFS foundry.StatDirFs,
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	var dco opsm.DeployOPChainOutput
+	var dco opcm.DeployOPChainOutput
 	err = CallScriptBroadcast(
 		ctx,
 		CallScriptBroadcastOpts{
@@ -40,9 +40,9 @@ func DeployOPChain(ctx context.Context, env *Env, artifactsFS foundry.StatDirFs,
 			Broadcaster: KeyedBroadcaster,
 			Handler: func(host *script.Host) error {
 				host.ImportState(st.ImplementationsDeployment.StateDump)
-				dco, err = opsm.DeployOPChain(
+				dco, err = opcm.DeployOPChain(
 					host,
-					opsm.DeployOPChainInput{
+					opcm.DeployOPChainInput{
 						OpChainProxyAdminOwner: thisIntent.Roles.ProxyAdminOwner,
 						SystemConfigOwner:      thisIntent.Roles.SystemConfigOwner,
 						Batcher:                thisIntent.Roles.Batcher,
@@ -52,7 +52,7 @@ func DeployOPChain(ctx context.Context, env *Env, artifactsFS foundry.StatDirFs,
 						BasefeeScalar:          1368,
 						BlobBaseFeeScalar:      801949,
 						L2ChainId:              chainID.Big(),
-						OpsmProxy:              st.ImplementationsDeployment.OpsmProxyAddress,
+						OpcmProxy:              st.ImplementationsDeployment.OpcmProxyAddress,
 					},
 				)
 				return err

op-chain-ops/deployer/pipeline/superchain.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opsm"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/state"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -24,7 +24,7 @@ func DeploySuperchain(ctx context.Context, env *Env, artifactsFS foundry.StatDir
 	lgr.Info("deploying superchain")
 
 	var dump *foundry.ForgeAllocs
-	var dso opsm.DeploySuperchainOutput
+	var dso opcm.DeploySuperchainOutput
 	var err error
 	err = CallScriptBroadcast(
 		ctx,
@@ -37,9 +37,9 @@ func DeploySuperchain(ctx context.Context, env *Env, artifactsFS foundry.StatDir
 			Client:      env.L1Client,
 			Broadcaster: KeyedBroadcaster,
 			Handler: func(host *script.Host) error {
-				dso, err = opsm.DeploySuperchain(
+				dso, err = opcm.DeploySuperchain(
 					host,
-					opsm.DeploySuperchainInput{
+					opcm.DeploySuperchainInput{
 						ProxyAdminOwner:            intent.SuperchainRoles.ProxyAdminOwner,
 						ProtocolVersionsOwner:      intent.SuperchainRoles.ProtocolVersionsOwner,
 						Guardian:                   intent.SuperchainRoles.Guardian,

op-chain-ops/deployer/state/state.go

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

op-chain-ops/interopgen/configs.go

@@ -33,7 +33,7 @@ type SuperFaultProofConfig struct {
 	DisputeGameFinalityDelaySeconds *big.Int
 }
 
-type OPSMImplementationsConfig struct {
+type OPCMImplementationsConfig struct {
 	Release string
 
 	FaultProof SuperFaultProofConfig
@@ -51,7 +51,7 @@ type SuperchainConfig struct {
 
 	Paused bool
 
-	Implementations OPSMImplementationsConfig
+	Implementations OPCMImplementationsConfig
 
 	genesis.SuperchainL1DeployConfig
 }

op-chain-ops/interopgen/deploy.go

@@ -5,13 +5,12 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opsm"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis/beacondeposit"
@@ -149,7 +148,7 @@ func prepareInitialL1(l1Host *script.Host, cfg *L1Config) (*L1Deployment, error)
 func deploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*SuperchainDeployment, error) {
 	l1Host.SetTxOrigin(superCfg.Deployer)
 
-	superDeployment, err := opsm.DeploySuperchain(l1Host, opsm.DeploySuperchainInput{
+	superDeployment, err := opcm.DeploySuperchain(l1Host, opcm.DeploySuperchainInput{
 		ProxyAdminOwner:            superCfg.ProxyAdminOwner,
 		ProtocolVersionsOwner:      superCfg.ProtocolVersionsOwner,
 		Guardian:                   superCfg.SuperchainConfigGuardian,
@@ -161,7 +160,7 @@ func deploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*Sup
 		return nil, fmt.Errorf("failed to deploy Superchain contracts: %w", err)
 	}
 
-	implementationsDeployment, err := opsm.DeployImplementations(l1Host, opsm.DeployImplementationsInput{
+	implementationsDeployment, err := opcm.DeployImplementations(l1Host, opcm.DeployImplementationsInput{
 		WithdrawalDelaySeconds:          superCfg.Implementations.FaultProof.WithdrawalDelaySeconds,
 		MinProposalSizeBytes:            superCfg.Implementations.FaultProof.MinProposalSizeBytes,
 		ChallengePeriodSeconds:          superCfg.Implementations.FaultProof.ChallengePeriodSeconds,
@@ -172,7 +171,7 @@ func deploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*Sup
 		ProtocolVersionsProxy:           superDeployment.ProtocolVersionsProxy,
 		SuperchainProxyAdmin:            superDeployment.SuperchainProxyAdmin,
 		UseInterop:                      superCfg.Implementations.UseInterop,
-		StandardVersionsToml:            opsm.StandardVersionsData,
+		StandardVersionsToml:            opcm.StandardVersionsData,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy Implementations contracts: %w", err)
@@ -197,7 +196,7 @@ func deployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 
 	l1Host.SetTxOrigin(cfg.Deployer)
 
-	output, err := opsm.DeployOPChain(l1Host, opsm.DeployOPChainInput{
+	output, err := opcm.DeployOPChain(l1Host, opcm.DeployOPChainInput{
 		OpChainProxyAdminOwner: cfg.ProxyAdminOwner,
 		SystemConfigOwner:      cfg.SystemConfigOwner,
 		Batcher:                cfg.BatchSenderAddress,
@@ -207,7 +206,7 @@ func deployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 		BasefeeScalar:          cfg.GasPriceOracleBaseFeeScalar,
 		BlobBaseFeeScalar:      cfg.GasPriceOracleBlobBaseFeeScalar,
 		L2ChainId:              new(big.Int).SetUint64(cfg.L2ChainID),
-		OpsmProxy:              superDeployment.OpsmProxy,
+		OpcmProxy:              superDeployment.OpcmProxy,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy L2 OP chain: %w", err)
@@ -220,8 +219,8 @@ func deployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 }
 
 func genesisL2(l2Host *script.Host, cfg *L2Config, deployment *L2Deployment) error {
-	if err := opsm.L2Genesis(l2Host, &opsm.L2GenesisInput{
-		L1Deployments: opsm.L1Deployments{
+	if err := opcm.L2Genesis(l2Host, &opcm.L2GenesisInput{
+		L1Deployments: opcm.L1Deployments{
 			L1CrossDomainMessengerProxy: deployment.L1CrossDomainMessengerProxy,
 			L1StandardBridgeProxy:       deployment.L1StandardBridgeProxy,
 			L1ERC721BridgeProxy:         deployment.L1ERC721BridgeProxy,

op-chain-ops/interopgen/deployments.go

@@ -9,8 +9,8 @@ type L1Deployment struct {
 }
 
 type Implementations struct {
-	OpsmProxy                        common.Address `json:"OPSMProxy"`
-	OpsmImpl                         common.Address `json:"OPSMImpl"`
+	OpcmProxy                        common.Address `json:"OPCMProxy"`
+	OpcmImpl                         common.Address `json:"OPCMImpl"`
 	DelayedWETHImpl                  common.Address `json:"DelayedWETHImpl"`
 	OptimismPortalImpl               common.Address `json:"OptimismPortalImpl"`
 	PreimageOracleSingleton          common.Address `json:"PreimageOracleSingleton"`

op-chain-ops/interopgen/recipe.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opsm"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 )
@@ -67,7 +67,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
 		ProxyAdminOwner:       superchainProxyAdmin,
 		ProtocolVersionsOwner: superchainProtocolVersionsOwner,
 		Deployer:              superchainDeployer,
-		Implementations: OPSMImplementationsConfig{
+		Implementations: OPCMImplementationsConfig{
 			Release: "dev",
 			FaultProof: SuperFaultProofConfig{
 				WithdrawalDelaySeconds:          big.NewInt(604800),
@@ -77,7 +77,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
 				DisputeGameFinalityDelaySeconds: big.NewInt(6),
 			},
 			UseInterop:           true,
-			StandardVersionsToml: opsm.StandardVersionsData,
+			StandardVersionsToml: opcm.StandardVersionsData,
 		},
 		SuperchainL1DeployConfig: genesis.SuperchainL1DeployConfig{
 			RequiredProtocolVersion:    params.OPStackSupport,