fix(hardfork): fix tests and update for height 0

block/fork.go

@@ -48,6 +48,9 @@ func (m *Manager) checkForkUpdate(ctx context.Context) error {
 		return err
 	}
 
+	if m.State.Height() == 0 {
+		return nil
+	}
 	lastBlock, err := m.Store.LoadBlock(m.State.Height())
 	if err != nil {
 		return err
@@ -154,27 +157,13 @@ func (m *Manager) handleSequencerForkTransition(instruction types.Instruction) {
 
 	// Create a new block with the consensus messages
 	m.Executor.AddConsensusMsgs(consensusMsgs...)
-
-	block, commit, err := m.produceBlock(true, nil)
-	if err != nil {
-		panic(fmt.Sprintf("produce block: %v", err))
-	}
-
-	err = m.applyBlock(block, commit, types.BlockMetaData{Source: types.Produced})
-	if err != nil {
-		panic(fmt.Sprintf("apply block: %v", err))
-	}
+	m.ProduceApplyGossipBlock(context.Background(), true)
 
 	// Create another block emtpy
-	block, commit, err = m.produceBlock(true, nil)
-	if err != nil {
-		panic(fmt.Sprintf("produce empty block: %v", err))
-	}
-
-	err = m.applyBlock(block, commit, types.BlockMetaData{Source: types.Produced})
+	m.ProduceApplyGossipBlock(context.Background(), true)
 
 	// Create Batch and send
-	_, err = m.CreateAndSubmitBatch(m.Conf.BatchSubmitBytes, false)
+	_, err := m.CreateAndSubmitBatch(m.Conf.BatchSubmitBytes, false)
 	if err != nil {
 		panic(fmt.Sprintf("create and submit batch: %v", err))
 	}

block/manager_test.go

@@ -186,7 +186,7 @@ func TestProduceOnlyAfterSynced(t *testing.T) {
 	assert.True(t, manager.State.Height() == 0)
 
 	// enough time to sync and produce blocks
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*4)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 	// Capture the error returned by manager.Start.
 

block/modes.go

@@ -70,6 +70,7 @@ func (m *Manager) runAsProposer(ctx context.Context, eg *errgroup.Group) error {
 	uerrors.ErrGroupGoLog(eg, m.logger, func() error {
 		return m.SubmitLoop(ctx, bytesProducedC)
 	})
+
 	uerrors.ErrGroupGoLog(eg, m.logger, func() error {
 		bytesProducedC <- m.GetUnsubmittedBytes() // load unsubmitted bytes from previous run
 		return m.ProduceBlockLoop(ctx, bytesProducedC)

block/submit.go

@@ -275,6 +275,7 @@ func (m *Manager) GetUnsubmittedBytes() int {
 		}
 		total += block.SizeBytes() + commit.SizeBytes()
 	}
+
 	return total
 }
 

block/submit_test.go

@@ -206,12 +206,12 @@ func TestBatchSubmissionFailedSubmission(t *testing.T) {
 	assert.Zero(t, manager.LastSettlementHeight.Load())
 
 	// try to submit, we expect failure
-	slmock.On("SubmitBatch", mock.Anything, mock.Anything, mock.Anything).Return(fmt.Errorf("submit batch")).Once()
+	slmock.On("SubmitBatch", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(fmt.Errorf("submit batch")).Once()
 	_, err = manager.CreateAndSubmitBatch(manager.Conf.BatchSubmitBytes, false)
 	assert.Error(t, err)
 
 	// try to submit again, we expect success
-	slmock.On("SubmitBatch", mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
+	slmock.On("SubmitBatch", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
 	manager.CreateAndSubmitBatch(manager.Conf.BatchSubmitBytes, false)
 	assert.EqualValues(t, manager.State.Height(), manager.LastSettlementHeight.Load())
 }

settlement/local/local.go

@@ -55,8 +55,11 @@ type Client struct {
 }
 
 func (c *Client) GetRollapp() (*types.Rollapp, error) {
-	// TODO implement me
-	panic("implement me")
+	return &types.Rollapp{
+		RollappID:           c.rollappID,
+		Revision:            0,
+		RevisionStartHeight: 1,
+	}, nil
 }
 
 var _ settlement.ClientI = (*Client)(nil)