freeze refactor

block/fork.go

@@ -33,9 +33,6 @@ func (m *Manager) MonitorForkUpdateLoop(ctx context.Context) error {
 			if err := m.checkForkUpdate(ctx); err != nil {
 				continue
 			}
-			if m.isFrozen() {
-				return nil
-			}
 		}
 	}
 }

block/manager.go

@@ -372,7 +372,7 @@ func (m *Manager) ValidateConfigWithRollappParams() error {
 		return err
 	}
 	if uint32(currentDRS) != m.State.RollappParams.DrsVersion {
-		return fmt.Errorf("DRS version mismatch. rollapp param: %d binary used:%d", m.State.RollappParams.DrsVersion, drsVersion)
+		return fmt.Errorf("DRS version mismatch. rollapp param: %d binary used:%d", m.State.RollappParams.DrsVersion, currentDRS)
 	}
 
 	if da.Client(m.State.RollappParams.Da) != m.DAClient.GetClientType() {

block/produce.go

@@ -45,11 +45,6 @@ func (m *Manager) ProduceBlockLoop(ctx context.Context, bytesProducedC chan int)
 				continue
 			}
 
-			// finish the block production loop in case the node is frozen
-			if m.isFrozen() {
-				return nil
-			}
-
 			// if empty blocks are configured to be enabled, and one is scheduled...
 			produceEmptyBlock := firstBlock || m.Conf.MaxIdleTime == 0 || nextEmptyBlock.Before(time.Now())
 			firstBlock = false

block/submit.go

@@ -35,7 +35,6 @@ func (m *Manager) SubmitLoop(ctx context.Context,
 		m.Conf.BatchSubmitTime,
 		m.Conf.BatchSubmitBytes,
 		m.CreateAndSubmitBatchGetSizeBlocksCommits,
-		m.isFrozen,
 	)
 }
 
@@ -49,7 +48,6 @@ func SubmitLoopInner(
 	maxBatchTime time.Duration, // max time to allow between batches
 	maxBatchBytes uint64, // max size of serialised batch in bytes
 	createAndSubmitBatch func(maxSizeBytes uint64) (sizeBlocksCommits uint64, err error),
-	frozen func() bool,
 ) error {
 	eg, ctx := errgroup.WithContext(ctx)
 
@@ -97,9 +95,7 @@ func SubmitLoopInner(
 			case <-ticker.C:
 			case <-submitter.C:
 			}
-			if frozen() {
-				return nil
-			}
+
 			pending := pendingBytes.Load()
 			types.RollappPendingSubmissionsSkewBytes.Set(float64(pendingBytes.Load()))
 			types.RollappPendingSubmissionsSkewBlocks.Set(float64(unsubmittedBlocks()))

block/submit_loop_test.go

@@ -113,10 +113,8 @@ func testSubmitLoopInner(
 	accumulatedBlocks := func() uint64 {
 		return pendingBlocks.Load()
 	}
-	frozen := func() bool {
-		return false
-	}
-	block.SubmitLoopInner(ctx, log.NewNopLogger(), producedBytesC, args.batchSkew, accumulatedBlocks, args.maxTime, args.batchBytes, submitBatch, frozen)
+
+	block.SubmitLoopInner(ctx, log.NewNopLogger(), producedBytesC, args.batchSkew, accumulatedBlocks, args.maxTime, args.batchBytes, submitBatch)
 }
 
 // Make sure the producer does not get too far ahead