Commit 5f7f44ca authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

op-deployer: Remove irrelevant flags (#12525)

We only need a `--artifacts-locator` flag now.
parent f99424de
...@@ -31,7 +31,6 @@ type OPCMConfig struct { ...@@ -31,7 +31,6 @@ type OPCMConfig struct {
PrivateKey string PrivateKey string
Logger log.Logger Logger log.Logger
ArtifactsLocator *opcm.ArtifactsLocator ArtifactsLocator *opcm.ArtifactsLocator
ContractsRelease string
privateKeyECDSA *ecdsa.PrivateKey privateKeyECDSA *ecdsa.PrivateKey
} }
...@@ -59,10 +58,6 @@ func (c *OPCMConfig) Check() error { ...@@ -59,10 +58,6 @@ func (c *OPCMConfig) Check() error {
return fmt.Errorf("artifacts locator must be specified") return fmt.Errorf("artifacts locator must be specified")
} }
if c.ContractsRelease == "" {
return fmt.Errorf("contracts release must be specified")
}
return nil return nil
} }
...@@ -73,12 +68,11 @@ func OPCMCLI(cliCtx *cli.Context) error { ...@@ -73,12 +68,11 @@ func OPCMCLI(cliCtx *cli.Context) error {
l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName) l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
privateKey := cliCtx.String(deployer.PrivateKeyFlagName) privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
artifactsURLStr := cliCtx.String(ArtifactsURLFlagName) artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
artifactsLocator := new(opcm.ArtifactsLocator) artifactsLocator := new(opcm.ArtifactsLocator)
if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil { if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
return fmt.Errorf("failed to parse artifacts URL: %w", err) return fmt.Errorf("failed to parse artifacts URL: %w", err)
} }
contractsRelease := cliCtx.String(ContractsReleaseFlagName)
ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context) ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
...@@ -87,7 +81,6 @@ func OPCMCLI(cliCtx *cli.Context) error { ...@@ -87,7 +81,6 @@ func OPCMCLI(cliCtx *cli.Context) error {
PrivateKey: privateKey, PrivateKey: privateKey,
Logger: l, Logger: l,
ArtifactsLocator: artifactsLocator, ArtifactsLocator: artifactsLocator,
ContractsRelease: contractsRelease,
}) })
} }
...@@ -138,7 +131,14 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error { ...@@ -138,7 +131,14 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID)) signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey) chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
lgr.Info("deploying OPCM", "release", cfg.ContractsRelease) var release string
if cfg.ArtifactsLocator.IsTag() {
release = cfg.ArtifactsLocator.Tag
} else {
release = "dev"
}
lgr.Info("deploying OPCM", "release", release)
var dio opcm.DeployImplementationsOutput var dio opcm.DeployImplementationsOutput
err = pipeline.CallScriptBroadcast( err = pipeline.CallScriptBroadcast(
...@@ -181,7 +181,7 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error { ...@@ -181,7 +181,7 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
ChallengePeriodSeconds: big.NewInt(86400), ChallengePeriodSeconds: big.NewInt(86400),
ProofMaturityDelaySeconds: big.NewInt(604800), ProofMaturityDelaySeconds: big.NewInt(604800),
DisputeGameFinalityDelaySeconds: big.NewInt(302400), DisputeGameFinalityDelaySeconds: big.NewInt(302400),
Release: cfg.ContractsRelease, Release: release,
SuperchainConfigProxy: superchainConfigAddr, SuperchainConfigProxy: superchainConfigAddr,
ProtocolVersionsProxy: protocolVersionsAddr, ProtocolVersionsProxy: protocolVersionsAddr,
OpcmProxyOwner: opcmProxyOwnerAddr, OpcmProxyOwner: opcmProxyOwnerAddr,
......
...@@ -7,28 +7,21 @@ import ( ...@@ -7,28 +7,21 @@ import (
) )
const ( const (
ArtifactsURLFlagName = "artifacts-url" ArtifactsLocatorFlagName = "artifacts-locator"
ContractsReleaseFlagName = "contracts-release"
) )
var ( var (
ArtifactsURLFlag = &cli.StringFlag{ ArtifactsLocatorFlag = &cli.StringFlag{
Name: ArtifactsURLFlagName, Name: ArtifactsLocatorFlagName,
Usage: "URL to the artifacts directory.", Usage: "Locator for artifacts.",
EnvVars: deployer.PrefixEnvVar("ARTIFACTS_URL"), EnvVars: deployer.PrefixEnvVar("ARTIFACTS_LOCATOR"),
}
ContractsReleaseFlag = &cli.StringFlag{
Name: ContractsReleaseFlagName,
Usage: "Release of the contracts to deploy.",
EnvVars: deployer.PrefixEnvVar("CONTRACTS_RELEASE"),
} }
) )
var OPCMFlags = []cli.Flag{ var OPCMFlags = []cli.Flag{
deployer.L1RPCURLFlag, deployer.L1RPCURLFlag,
deployer.PrivateKeyFlag, deployer.PrivateKeyFlag,
ArtifactsURLFlag, ArtifactsLocatorFlag,
ContractsReleaseFlag,
} }
var Commands = []*cli.Command{ var Commands = []*cli.Command{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment