migration: Make migration-block-time a required flag (#242)

Make migration-block-time a required flag --------- Co-authored-by: alecps <[email protected]> Co-authored-by: piersy <[email protected]>
celo-org · Oct 14, 2024 · 8e1df24 · 8e1df24
1 parent 19db904
commit 8e1df24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/op-chain-ops/cmd/celo-migrate/main.go b/op-chain-ops/cmd/celo-migrate/main.go
@@ -67,8 +67,9 @@ var (
 		Required: true,
 	}
 	migrationBlockTimeFlag = &cli.Uint64Flag{
-		Name:  "migration-block-time",
-		Usage: "Specifies a unix timestamp to use for the migration block. If not provided, the current time will be used.",
+		Name:     "migration-block-time",
+		Usage:    "Specifies a unix timestamp to use for the migration block. This should be set to the same timestamp as was used for the sequencer migration. If performing the sequencer migration, this should set to a time in the future around when the migration script is expected to complete.",
+		Required: true,
 	}
 	oldDBPathFlag = &cli.PathFlag{
 		Name:     "old-db",

diff --git a/op-chain-ops/cmd/celo-migrate/state.go b/op-chain-ops/cmd/celo-migrate/state.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"time"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
@@ -157,10 +156,6 @@ func applyStateMigrationChanges(config *genesis.DeployConfig, l2Allocs types.Gen
 		return nil, err
 	}
 
-	if migrationBlockTime == 0 {
-		migrationBlockTime = uint64(time.Now().Unix())
-	}
-
 	// Set the standard options.
 	cfg.LondonBlock = migrationBlockNumber
 	cfg.BerlinBlock = migrationBlockNumber