Always re-index from latestCadenceHeight + 1

Author: m-Peter

bootstrap/bootstrap.go

@@ -143,15 +143,23 @@ func (b *Bootstrap) StartEventIngestion(ctx context.Context) error {
 
 	chainID := b.config.FlowNetworkID
 
-	// Create EVM event subscriber
-	// Event ingestion & tx replay is idempotent, so we use the
-	// `latestCadenceHeight` to be on the safe side.
+	// the event subscriber takes the first block to sync from the Access node,
+	// which is the block after the latest cadence block
+	nextCadenceHeight := latestCadenceHeight + 1
+	// Special case when using a local Emulator as Access Node. The Emulator
+	// always starts at block height 0, so if we try to subscribe at block
+	// height 1, we'll get an error, as it doesn't exist.
+	if latestCadenceHeight == config.EmulatorInitCadenceHeight {
+		nextCadenceHeight -= 1
+	}
+
+	// create EVM event subscriber
 	subscriber := ingestion.NewRPCEventSubscriber(
 		b.logger,
 		b.client,
 		chainID,
 		b.keystore,
-		latestCadenceHeight,
+		nextCadenceHeight,
 	)
 
 	callTracerCollector, err := replayer.NewCallTracerCollector(