From 2bbb7c3ca893c220dc8a4568519e5f461ae2fbfa Mon Sep 17 00:00:00 2001
From: Paul Lange <palango@gmx.de>
Date: Tue, 1 Oct 2024 16:40:22 +0200
Subject: [PATCH] migration: Use deterministic default for migration block
 timestamp

---
 op-chain-ops/cmd/celo-migrate/state.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/op-chain-ops/cmd/celo-migrate/state.go b/op-chain-ops/cmd/celo-migrate/state.go
index 1fbf26e025ae..80eb21618143 100644
--- 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/jsonutil"
@@ -157,7 +156,9 @@ func applyStateMigrationChanges(config *genesis.DeployConfig, l2Allocs types.Gen
 	}
 
 	if migrationBlockTime == 0 {
-		migrationBlockTime = uint64(time.Now().Unix())
+		// If the migration block time is not set, use the time of the last block incremented by one.
+		// This makes sure the migration is deterministic.
+		migrationBlockTime = header.Time + config.L2BlockTime
 	}
 
 	// Set the standard options.