Fix boundaries for migration

Author: jakeloo

cmd/migrate_valid.go

@@ -55,6 +55,9 @@ func RunValidationMigration(cmd *cobra.Command, args []string) {
 
 	// Calculate work distribution for workers
 	numWorkers := DEFAULT_WORKERS
+	if config.Cfg.Migrator.WorkerCount > 0 {
+		numWorkers = int(config.Cfg.Migrator.WorkerCount)
+	}
 	workRanges := divideBlockRange(rangeStartBlock, rangeEndBlock, numWorkers)
 	log.Info().Msgf("Starting %d workers to process migration", len(workRanges))
 
@@ -376,7 +379,9 @@ func (m *Migrator) DetermineMigrationBoundaries(targetStartBlock, targetEndBlock
 	}
 
 	log.Info().Msgf("Block in the target storage for range %s to %s: count=%s, max=%s", startBlock.String(), endBlock.String(), blockCount.String(), maxStoredBlock.String())
-	if maxStoredBlock != nil && maxStoredBlock.Cmp(startBlock) >= 0 {
+	// Only adjust start block if we actually have blocks stored (count > 0)
+	// When count is 0, maxStoredBlock might be 0 but that doesn't mean block 0 exists
+	if blockCount.Sign() > 0 && maxStoredBlock != nil && maxStoredBlock.Cmp(startBlock) >= 0 {
 		startBlock = new(big.Int).Add(maxStoredBlock, big.NewInt(1))
 	}
 
@@ -411,7 +416,9 @@ func (m *Migrator) DetermineMigrationBoundariesForRange(rangeStart, rangeEnd *bi
 	}
 
 	actualStart := rangeStart
-	if maxStoredBlock != nil && maxStoredBlock.Cmp(rangeStart) >= 0 {
+	// Only adjust start block if we actually have blocks stored (blockCount > 0)
+	// When blockCount is 0, maxStoredBlock might be 0 but that doesn't mean block 0 exists
+	if blockCount.Sign() > 0 && maxStoredBlock != nil && maxStoredBlock.Cmp(rangeStart) >= 0 {
 		// We have some blocks already, start from the next one
 		actualStart = new(big.Int).Add(maxStoredBlock, big.NewInt(1))
 

cmd/root.go

@@ -239,6 +239,7 @@ func init() {
 	rootCmd.PersistentFlags().Uint("migrator-batchSize", 2000, "Batch size for storage operations in migrator")
 	rootCmd.PersistentFlags().Uint("migrator-startBlock", 0, "Start block for migration")
 	rootCmd.PersistentFlags().Uint("migrator-endBlock", 0, "End block for migration")
+	rootCmd.PersistentFlags().Uint("migrator-workerCount", 0, "Worker count for migration")
 
 	viper.BindPFlag("rpc.url", rootCmd.PersistentFlags().Lookup("rpc-url"))
 	viper.BindPFlag("rpc.blocks.blocksPerRequest", rootCmd.PersistentFlags().Lookup("rpc-blocks-blocksPerRequest"))
@@ -443,6 +444,8 @@ func init() {
 	viper.BindPFlag("migrator.startBlock", rootCmd.PersistentFlags().Lookup("migrator-startBlock"))
 	viper.BindPFlag("migrator.endBlock", rootCmd.PersistentFlags().Lookup("migrator-endBlock"))
 	viper.BindPFlag("migrator.batchSize", rootCmd.PersistentFlags().Lookup("migrator-batchSize"))
+	viper.BindPFlag("migrator.workerCount", rootCmd.PersistentFlags().Lookup("migrator-workerCount"))
+
 	rootCmd.AddCommand(orchestratorCmd)
 	rootCmd.AddCommand(apiCmd)
 	rootCmd.AddCommand(validateAndFixCmd)

configs/config.go

@@ -267,6 +267,7 @@ type MigratorConfig struct {
 	StartBlock  uint              `mapstructure:"startBlock"`
 	EndBlock    uint              `mapstructure:"endBlock"`
 	BatchSize   uint              `mapstructure:"batchSize"`
+	WorkerCount uint              `mapstructure:"workerCount"`
 }
 
 type Config struct {