Refine fork poc

.github/workflows/ci.yml

@@ -85,7 +85,6 @@ jobs:
 
   op-node-test:
     runs-on: ubuntu-latest
-    needs: op-node-lint
 
     steps:
       - name: Check out code

op-batcher/batcher/channel_builder_test.go

@@ -782,7 +782,7 @@ func ChannelBuilder_InputBytes(t *testing.T, batchType uint) {
 			require.NoError(err)
 			err = spanBatch.AppendSingularBatch(singularBatch, l1Info.SequenceNumber)
 			require.NoError(err)
-			rawSpanBatch, err := spanBatch.ToRawSpanBatch()
+			rawSpanBatch, err := spanBatch.ToRawSpanBatch(&defaultTestRollupConfig)
 			require.NoError(err)
 			batch := derive.NewBatchData(rawSpanBatch)
 			var buf bytes.Buffer

op-chain-ops/genesis/config.go

@@ -720,7 +720,7 @@ func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHas
 				GasLimit:    uint64(d.L2GenesisBlockGasLimit),
 			},
 		},
-		//BlockTime:              d.L2BlockTime,
+		BlockTime:              d.L2BlockTime,
 		MaxSequencerDrift:      d.MaxSequencerDrift,
 		SeqWindowSize:          d.SequencerWindowSize,
 		ChannelTimeout:         d.ChannelTimeout,

op-node/benchmarks/batchbuilding_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-batcher/compressor"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/stretchr/testify/require"
 )
@@ -171,13 +172,15 @@ func BenchmarkFinalBatchChannelOut(b *testing.B) {
 				cout, _ := channelOutByType(b, tc.BatchType, tc.cd)
 				// add all but the final batch to the channel out
 				for i := 0; i < tc.BatchCount-1; i++ {
-					err := cout.AddSingularBatch(batches[i], 0)
+					var cfg rollup.Config
+					err := cout.AddSingularBatch(&cfg, batches[i], 0)
 					require.NoError(b, err)
 				}
 				// measure the time to add the final batch
 				b.StartTimer()
 				// add the final batch to the channel out
-				err := cout.AddSingularBatch(batches[tc.BatchCount-1], 0)
+				var cfg rollup.Config
+				err := cout.AddSingularBatch(&cfg, batches[tc.BatchCount-1], 0)
 				require.NoError(b, err)
 			}
 		})
@@ -233,7 +236,8 @@ func BenchmarkIncremental(b *testing.B) {
 				}
 				b.StartTimer()
 				for i := 0; i < tc.BatchCount; i++ {
-					err := cout.AddSingularBatch(batches[i], 0)
+					var cfg rollup.Config
+					err := cout.AddSingularBatch(&cfg, batches[i], 0)
 					if err != nil {
 						done = true
 						return
@@ -297,7 +301,8 @@ func BenchmarkAllBatchesChannelOut(b *testing.B) {
 				b.StartTimer()
 				// add all batches to the channel out
 				for i := 0; i < tc.BatchCount; i++ {
-					err := cout.AddSingularBatch(batches[i], 0)
+					var cfg rollup.Config
+					err := cout.AddSingularBatch(&cfg, batches[i], 0)
 					require.NoError(b, err)
 				}
 			}
@@ -347,7 +352,8 @@ func BenchmarkGetRawSpanBatch(b *testing.B) {
 					require.NoError(b, err)
 				}
 				b.StartTimer()
-				_, err := spanBatch.ToRawSpanBatch()
+				var cfg rollup.Config
+				_, err := spanBatch.ToRawSpanBatch(&cfg)
 				require.NoError(b, err)
 			}
 		})

op-node/chaincfg/chains.go

@@ -127,7 +127,7 @@ var OPBNBMainnet = rollup.Config{
 			GasLimit:    100000000,
 		},
 	},
-	//BlockTime:              1,
+	BlockTime:              1,
 	MaxSequencerDrift:      600,
 	SeqWindowSize:          14400,
 	ChannelTimeout:         1200,
@@ -163,7 +163,7 @@ var OPBNBTestnet = rollup.Config{
 			GasLimit:    100000000,
 		},
 	},
-	//BlockTime:              1,
+	BlockTime:              1,
 	MaxSequencerDrift:      600,
 	SeqWindowSize:          14400,
 	ChannelTimeout:         1200,
@@ -199,7 +199,7 @@ var OPBNBQANet = rollup.Config{
 			GasLimit:    100000000,
 		},
 	},
-	//BlockTime:              1,
+	BlockTime:              1,
 	MaxSequencerDrift:      600,
 	SeqWindowSize:          14400,
 	ChannelTimeout:         1200,

op-node/cmd/batch_decoder/reassemble/reassemble.go

@@ -135,7 +135,7 @@ func processFrames(cfg Config, rollupCfg *rollup.Config, id derive.ChannelID, fr
 						// singularBatch will be nil when errored
 						batches = append(batches, singularBatch)
 					case derive.SpanBatchType:
-						spanBatch, err := derive.DeriveSpanBatch(batchData, cfg.L2BlockTime, cfg.L2GenesisTime, cfg.L2ChainID)
+						spanBatch, err := derive.DeriveSpanBatch(batchData, rollupCfg, cfg.L2GenesisTime, cfg.L2ChainID)
 						if err != nil {
 							invalidBatches = true
 							fmt.Printf("Error deriving spanBatch from batchData for channel %v. Err: %v\n", id.String(), err)

op-node/p2p/app_params.go

@@ -24,7 +24,7 @@ type ApplicationScoreParams struct {
 }
 
 func LightApplicationScoreParams(cfg *rollup.Config) ApplicationScoreParams {
-	slot := time.Duration(rollup.VoltBlockTime) * time.Millisecond
+	slot := time.Duration(cfg.BlockTime) * time.Second
 	if slot == 0 {
 		slot = 2 * time.Second
 	}

op-node/p2p/peer_params.go

@@ -33,7 +33,7 @@ func ScoreDecay(duration time.Duration, slot time.Duration) float64 {
 //
 // [PeerScoreParams]: https://pkg.go.dev/github.com/libp2p/go-libp2p-pubsub@v0.8.1#PeerScoreParams
 func LightPeerScoreParams(cfg *rollup.Config) pubsub.PeerScoreParams {
-	slot := time.Duration(rollup.VoltBlockTime) * time.Millisecond
+	slot := time.Duration(cfg.BlockTime) * time.Second
 	if slot == 0 {
 		slot = 2 * time.Second
 	}

op-node/rollup/chain_spec_test.go

@@ -33,7 +33,7 @@ var testConfig = Config{
 			GasLimit:    30_000_000,
 		},
 	},
-	BlockTime:               2000,
+	BlockTime:               2,
 	MaxSequencerDrift:       600,
 	SeqWindowSize:           3600,
 	ChannelTimeout:          300,

op-node/rollup/derive/batch_queue_test.go

@@ -55,7 +55,7 @@ func b(chainId *big.Int, timestamp uint64, epoch eth.L1BlockRef) *SingularBatch
 	txData, _ := tx.MarshalBinary()
 	return &SingularBatch{
 		ParentHash:   mockHash(timestamp-2, 2),
-		Timestamp:    timestamp * 1000,
+		Timestamp:    timestamp * 1000, // after derive, this is millisecond timestamp, mock ut
 		EpochNum:     rollup.Epoch(epoch.Number),
 		EpochHash:    epoch.Hash,
 		Transactions: []hexutil.Bytes{txData},
@@ -115,7 +115,7 @@ func singularBatchToBlockRef(t *testing.T, batch *SingularBatch, blockNumber uin
 		Hash:       mockHash(batch.Timestamp/1000, 2),
 		Number:     blockNumber,
 		ParentHash: batch.ParentHash,
-		Time:       batch.Timestamp,
+		Time:       batch.Timestamp / 1000, // second timestamp
 		L1Origin:   eth.BlockID{Hash: batch.EpochHash, Number: uint64(batch.EpochNum)},
 	}
 }
@@ -242,7 +242,7 @@ func BatchQueueEager(t *testing.T, batchType int) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     30,
 		DeltaTime:         getDeltaTime(batchType),
@@ -295,7 +295,7 @@ func BatchQueueEager(t *testing.T, batchType int) {
 		} else {
 			require.Equal(t, expectedOutputBatches[i], b)
 			safeHead.Number += 1
-			safeHead.Time += cfg.SecondBlockInterval()
+			safeHead.Time += cfg.BlockTime
 			safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 			safeHead.L1Origin = b.Epoch()
 		}
@@ -320,7 +320,7 @@ func BatchQueueInvalidInternalAdvance(t *testing.T, batchType int) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     2,
 		DeltaTime:         getDeltaTime(batchType),
@@ -396,11 +396,11 @@ func BatchQueueInvalidInternalAdvance(t *testing.T, batchType int) {
 	b, _, e = bq.NextBatch(context.Background(), safeHead)
 	require.Nil(t, e)
 	require.NotNil(t, b)
-	require.Equal(t, (safeHead.Time+2)*1000, b.Timestamp)
+	require.Equal(t, safeHead.Time+2, b.Timestamp/1000)
 	require.Equal(t, rollup.Epoch(1), b.EpochNum)
 	safeHead.Number += 1
 	safeHead.Time += 2
-	safeHead.Hash = mockHash(b.Timestamp, 2)
+	safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 	safeHead.L1Origin = b.Epoch()
 	b, _, e = bq.NextBatch(context.Background(), safeHead)
 	require.ErrorIs(t, e, io.EOF)
@@ -412,10 +412,10 @@ func BatchQueueInvalidInternalAdvance(t *testing.T, batchType int) {
 	require.Nil(t, e)
 	require.NotNil(t, b)
 	require.Equal(t, rollup.Epoch(2), b.EpochNum)
-	require.Equal(t, (safeHead.Time+2)*1000, b.Timestamp)
+	require.Equal(t, safeHead.Time+2, b.Timestamp/1000)
 	safeHead.Number += 1
 	safeHead.Time += 2
-	safeHead.Hash = mockHash(b.Timestamp, 2)
+	safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 	safeHead.L1Origin = b.Epoch()
 	b, _, e = bq.NextBatch(context.Background(), safeHead)
 	require.ErrorIs(t, e, io.EOF)
@@ -440,7 +440,7 @@ func BatchQueueMissing(t *testing.T, batchType int) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     2,
 		DeltaTime:         getDeltaTime(batchType),
@@ -498,7 +498,7 @@ func BatchQueueMissing(t *testing.T, batchType int) {
 	// Check for a generated batch at t = 12
 	b, _, e = bq.NextBatch(context.Background(), safeHead)
 	require.Nil(t, e)
-	require.Equal(t, b.Timestamp, uint64(12000))
+	require.Equal(t, b.Timestamp/1000, uint64(12))
 	require.Empty(t, b.Transactions)
 	require.Equal(t, rollup.Epoch(0), b.EpochNum)
 	safeHead.Number += 1
@@ -508,7 +508,7 @@ func BatchQueueMissing(t *testing.T, batchType int) {
 	// Check for generated batch at t = 14
 	b, _, e = bq.NextBatch(context.Background(), safeHead)
 	require.Nil(t, e)
-	require.Equal(t, b.Timestamp, uint64(14000))
+	require.Equal(t, b.Timestamp/1000, uint64(14))
 	require.Empty(t, b.Transactions)
 	require.Equal(t, rollup.Epoch(0), b.EpochNum)
 	safeHead.Number += 1
@@ -534,7 +534,7 @@ func BatchQueueMissing(t *testing.T, batchType int) {
 	require.Equal(t, e, io.EOF)
 	b, _, e = bq.NextBatch(context.Background(), safeHead)
 	require.Nil(t, e)
-	require.Equal(t, b.Timestamp, uint64(18000))
+	require.Equal(t, b.Timestamp/1000, uint64(18))
 	require.Empty(t, b.Transactions)
 	require.Equal(t, rollup.Epoch(1), b.EpochNum)
 }
@@ -557,7 +557,7 @@ func BatchQueueAdvancedEpoch(t *testing.T, batchType int) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     30,
 		DeltaTime:         getDeltaTime(batchType),
@@ -620,7 +620,7 @@ func BatchQueueAdvancedEpoch(t *testing.T, batchType int) {
 		} else {
 			require.Equal(t, expectedOutput, b)
 			safeHead.Number += 1
-			safeHead.Time += cfg.SecondBlockInterval()
+			safeHead.Time += cfg.BlockTime
 			safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 			safeHead.L1Origin = b.Epoch()
 		}
@@ -644,7 +644,7 @@ func BatchQueueShuffle(t *testing.T, batchType int) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     30,
 		DeltaTime:         getDeltaTime(batchType),
@@ -719,7 +719,7 @@ func BatchQueueShuffle(t *testing.T, batchType int) {
 		} else {
 			require.Equal(t, expectedOutput, b)
 			safeHead.Number += 1
-			safeHead.Time += cfg.SecondBlockInterval()
+			safeHead.Time += cfg.BlockTime
 			safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 			safeHead.L1Origin = b.Epoch()
 		}
@@ -742,7 +742,7 @@ func TestBatchQueueOverlappingSpanBatch(t *testing.T) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     30,
 		DeltaTime:         getDeltaTime(SpanBatchType),
@@ -822,7 +822,7 @@ func TestBatchQueueOverlappingSpanBatch(t *testing.T) {
 		} else {
 			require.Equal(t, expectedOutputBatches[i], b)
 			safeHead.Number += 1
-			safeHead.Time += cfg.SecondBlockInterval()
+			safeHead.Time += cfg.BlockTime
 			safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 			safeHead.L1Origin = b.Epoch()
 		}
@@ -847,7 +847,7 @@ func TestBatchQueueComplex(t *testing.T) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     30,
 		DeltaTime:         getDeltaTime(SpanBatchType),
@@ -940,7 +940,7 @@ func TestBatchQueueComplex(t *testing.T) {
 		} else {
 			require.Equal(t, expectedOutput, b)
 			safeHead.Number += 1
-			safeHead.Time += cfg.SecondBlockInterval()
+			safeHead.Time += cfg.BlockTime
 			safeHead.Hash = mockHash(b.Timestamp/1000, 2)
 			safeHead.L1Origin = b.Epoch()
 		}
@@ -965,7 +965,7 @@ func TestBatchQueueResetSpan(t *testing.T) {
 		Genesis: rollup.Genesis{
 			L2Time: 10,
 		},
-		BlockTime:         2000,
+		BlockTime:         2,
 		MaxSequencerDrift: 600,
 		SeqWindowSize:     30,
 		DeltaTime:         getDeltaTime(SpanBatchType),
@@ -998,7 +998,7 @@ func TestBatchQueueResetSpan(t *testing.T) {
 
 	// This NextBatch() will return the second singular batch.
 	safeHead.Number += 1
-	safeHead.Time += cfg.SecondBlockInterval()
+	safeHead.Time += cfg.BlockTime
 	safeHead.Hash = mockHash(nextBatch.Timestamp/1000, 2)
 	safeHead.L1Origin = nextBatch.Epoch()
 	nextBatch, _, err = bq.NextBatch(context.Background(), safeHead)

op-node/rollup/derive/batch_test.go

@@ -78,7 +78,7 @@ func RandomRawSpanBatch(rng *rand.Rand, chainId *big.Int) *RawSpanBatch {
 
 func RandomValidConsecutiveSingularBatches(rng *rand.Rand, chainID *big.Int) []*SingularBatch {
 	blockCount := 2 + rng.Intn(128)
-	l2BlockTime := uint64(2) * 1000 // ms
+	l2BlockTime := uint64(2)
 
 	var singularBatches []*SingularBatch
 	for i := 0; i < blockCount; i++ {
@@ -87,7 +87,7 @@ func RandomValidConsecutiveSingularBatches(rng *rand.Rand, chainID *big.Int) []*
 	}
 	l1BlockNum := rng.Uint64()
 	// make sure oldest timestamp is large enough
-	singularBatches[0].Timestamp += 256 * 1000 // ms
+	singularBatches[0].Timestamp += 256
 	for i := 0; i < blockCount; i++ {
 		originChangedBit := rng.Intn(2)
 		if originChangedBit == 1 {
@@ -160,7 +160,9 @@ func TestBatchRoundTrip(t *testing.T) {
 		err = dec.UnmarshalBinary(enc)
 		require.NoError(t, err)
 		if dec.GetBatchType() == SpanBatchType {
-			_, err := DeriveSpanBatch(&dec, blockTime, genesisTimestamp, chainID)
+			var cfg rollup.Config
+			cfg.BlockTime = blockTime
+			_, err := DeriveSpanBatch(&dec, &cfg, genesisTimestamp, chainID)
 			require.NoError(t, err)
 		}
 		require.Equal(t, batch, &dec, "Batch not equal test case %v", i)
@@ -208,7 +210,9 @@ func TestBatchRoundTripRLP(t *testing.T) {
 		err = dec.DecodeRLP(s)
 		require.NoError(t, err)
 		if dec.GetBatchType() == SpanBatchType {
-			_, err = DeriveSpanBatch(&dec, blockTime, genesisTimestamp, chainID)
+			var cfg rollup.Config
+			cfg.BlockTime = blockTime
+			_, err = DeriveSpanBatch(&dec, &cfg, genesisTimestamp, chainID)
 			require.NoError(t, err)
 		}
 		require.Equal(t, batch, &dec, "Batch not equal test case %v", i)