fix: deploy impl changes along with new opcm for sepolia.

ethereum-optimism · Nov 15, 2024 · 1ccb4e3 · 1ccb4e3
1 parent ea97afe
commit 1ccb4e3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/op-chain-ops/interopgen/configs.go b/op-chain-ops/interopgen/configs.go
@@ -35,7 +35,7 @@ type SuperFaultProofConfig struct {
 }
 
 type OPCMImplementationsConfig struct {
-	L1ContractsReleaseVersion string
+	L1ContractsRelease string
 
 	FaultProof SuperFaultProofConfig
 

diff --git a/op-chain-ops/interopgen/deploy.go b/op-chain-ops/interopgen/deploy.go
@@ -170,7 +170,7 @@ func DeploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*Sup
 		ProofMaturityDelaySeconds:       superCfg.Implementations.FaultProof.ProofMaturityDelaySeconds,
 		DisputeGameFinalityDelaySeconds: superCfg.Implementations.FaultProof.DisputeGameFinalityDelaySeconds,
 		MipsVersion:                     superCfg.Implementations.FaultProof.MipsVersion,
-		L1ContractsReleaseVersion:       superCfg.Implementations.L1ContractsReleaseVersion,
+		L1ContractsRelease:              superCfg.Implementations.L1ContractsRelease,
 		SuperchainConfigProxy:           superDeployment.SuperchainConfigProxy,
 		ProtocolVersionsProxy:           superDeployment.ProtocolVersionsProxy,
 		UseInterop:                      superCfg.Implementations.UseInterop,

diff --git a/op-chain-ops/interopgen/recipe.go b/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{
-			L1ContractsReleaseVersion: "dev",
+			L1ContractsRelease: "dev",
 			FaultProof: SuperFaultProofConfig{
 				WithdrawalDelaySeconds:          big.NewInt(604800),
 				MinProposalSizeBytes:            big.NewInt(10000),

diff --git a/op-deployer/pkg/deployer/bootstrap/opcm.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -195,14 +195,14 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 	}
 	host.SetNonce(chainDeployer, nonce)
 
-	var l1ContractsReleaseVersion string
+	var l1ContractsRelease string
 	if cfg.ArtifactsLocator.IsTag() {
-		l1ContractsReleaseVersion = cfg.ArtifactsLocator.Tag
+		l1ContractsRelease = cfg.ArtifactsLocator.Tag
 	} else {
-		l1ContractsReleaseVersion = "dev"
+		l1ContractsRelease = "dev"
 	}
 
-	lgr.Info("deploying OPCM", "l1ContractsReleaseVersion", l1ContractsReleaseVersion)
+	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.
@@ -234,7 +234,7 @@ 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),
-			L1ContractsReleaseVersion:       l1ContractsReleaseVersion,
+			L1ContractsRelease:              l1ContractsRelease,
 			SuperchainConfigProxy:           superchainConfigAddr,
 			ProtocolVersionsProxy:           protocolVersionsAddr,
 			StandardVersionsToml:            standardVersionsTOML,

diff --git a/op-deployer/pkg/deployer/opcm/implementations.go b/op-deployer/pkg/deployer/opcm/implementations.go
@@ -18,10 +18,10 @@ type DeployImplementationsInput struct {
 	DisputeGameFinalityDelaySeconds *big.Int
 	MipsVersion                     *big.Int
 	// Release version to set OPCM implementations for, of the format `op-contracts/vX.Y.Z`.
-	L1ContractsReleaseVersion string
-	SuperchainConfigProxy     common.Address
-	ProtocolVersionsProxy     common.Address
-	UseInterop                bool // if true, deploy Interop implementations
+	L1ContractsRelease    string
+	SuperchainConfigProxy common.Address
+	ProtocolVersionsProxy common.Address
+	UseInterop            bool // if true, deploy Interop implementations
 
 	StandardVersionsToml string // contents of 'standard-versions-mainnet.toml' or 'standard-versions-sepolia.toml' file
 }

diff --git a/op-deployer/pkg/deployer/pipeline/implementations.go b/op-deployer/pkg/deployer/pipeline/implementations.go
@@ -68,7 +68,7 @@ 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),
-			L1ContractsReleaseVersion:       contractsRelease,
+			L1ContractsRelease:              contractsRelease,
 			SuperchainConfigProxy:           st.SuperchainDeployment.SuperchainConfigProxyAddress,
 			ProtocolVersionsProxy:           st.SuperchainDeployment.ProtocolVersionsProxyAddress,
 			StandardVersionsToml:            standardVersionsTOML,

diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
@@ -137,8 +137,8 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 		// TODO: @blmalone this needs re-bootstrapped because it's still proxied
 		return common.HexToAddress(""), nil
 	case 11155111:
-		// Generated using the bootstrap command on 11/14/2024.
-		return common.HexToAddress(""), nil
+		// Generated using the bootstrap command on 11/15/2024.
+		return common.HexToAddress("0xf0a769f13049713a5c5228a2d181a59a6bd780dd"), nil
 	default:
 		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
 	}
@@ -173,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("347191419b27e00e010f7cfd4e43b940d6acbe57cbfefe86000156967129d848"))
 	case "op-contracts/v1.7.0-beta.1+l2-contracts":
 		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
 	default: