still trying to fix issues unrealted to this work

Author: tac0turtle

block/da_includer.go

@@ -36,7 +36,7 @@ func (m *Manager) DAIncluderLoop(ctx context.Context, errCh chan<- error) {
 				}
 				// Both header and data are DA-included, so we can advance the height
 				if err := m.incrementDAIncludedHeight(ctx); err != nil {
-					errCh <- fmt.Errorf("error while incrementing DA included height: %w", err)
+					errCh <- fmt.Errorf("while incrementing DA included height: %w", err)
 					return
 				}
 

block/submitter.go

@@ -118,7 +118,7 @@ func submitToDA[T any](
 
 		switch res.Code {
 		case coreda.StatusSuccess:
-			m.logger.Info(fmt.Sprintf("successfully submitted %s to DA layer", itemType), "gasPrice", gasPrice, "count", res.SubmittedCount)
+			m.logger.Info(fmt.Sprintf("successfully submitted %s to DA layer,", itemType), "gasPrice ", gasPrice, "count", res.SubmittedCount)
 			if res.SubmittedCount == uint64(remLen) {
 				submittedAll = true
 			}

block/sync.go

@@ -173,7 +173,7 @@ func (m *Manager) handleEmptyDataHash(ctx context.Context, header *types.Header)
 		if headerHeight > 1 {
 			_, lastData, err := m.store.GetBlockData(ctx, headerHeight-1)
 			if err != nil {
-				m.logger.Debug("previous block not applied yet", "current height", headerHeight, "previous height", headerHeight-1, "error", err)
+				m.logger.Debug("previous block not applied yet, current height: ", headerHeight, "previous height: ", headerHeight-1, "error: ", err)
 			}
 			if lastData != nil {
 				lastDataHash = lastData.Hash()

execution/evm/execution.go

@@ -181,16 +181,11 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 		txsPayload[i] = "0x" + hex.EncodeToString(tx)
 	}
 
-	prevBlockHash, _, prevGasLimit, prevTimestamp, err := c.getBlockInfo(ctx, blockHeight-1)
+	prevBlockHash, _, prevGasLimit, _, err := c.getBlockInfo(ctx, blockHeight-1)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to get block info: %w", err)
 	}
 
-	ts := uint64(timestamp.Unix())
-	if ts <= prevTimestamp {
-		ts = prevTimestamp + 1 // Subsequent blocks must have a higher timestamp.
-	}
-
 	c.mu.Lock()
 	args := engine.ForkchoiceStateV1{
 		HeadBlockHash:      prevBlockHash,
@@ -205,7 +200,7 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 	// Create rollkit-compatible payload attributes with flattened structure
 	rollkitPayloadAttrs := map[string]interface{}{
 		// Standard Ethereum payload attributes (flattened) - using camelCase as expected by JSON
-		"timestamp":             ts,
+		"timestamp":             timestamp.Unix(),
 		"prevRandao":            c.derivePrevRandao(blockHeight),
 		"suggestedFeeRecipient": c.feeRecipient,
 		"withdrawals":           []*types.Withdrawal{},
@@ -300,6 +295,13 @@ func (c *EngineClient) setFinal(ctx context.Context, blockHash common.Hash, isFi
 
 // SetFinal marks the block at the given height as finalized
 func (c *EngineClient) SetFinal(ctx context.Context, blockHeight uint64) error {
+	fmt.Println("Setting final block at height:", blockHeight)
+	if blockHeight == 1 {
+		_, _, _, _, err := c.getBlockInfo(ctx, blockHeight)
+		if err != nil {
+			return fmt.Errorf("failed to get block info for height 0: %w", err)
+		}
+	}
 	blockHash, _, _, _, err := c.getBlockInfo(ctx, blockHeight)
 	if err != nil {
 		return fmt.Errorf("failed to get block info: %w", err)

scripts/run.go

@@ -255,7 +255,7 @@ func main() {
 			time.Sleep(3 * time.Second)
 
 			// Get node ID of the first node to use for peer connections
-			nodeIdCmd := exec.Command(appPath, "node-info", fmt.Sprintf("--home=%s", nodeHome))
+			nodeIdCmd := exec.Command(appPath, "net-info", fmt.Sprintf("--home=%s", nodeHome))
 			nodeInfoOutput, err := nodeIdCmd.CombinedOutput()
 			if err != nil {
 				log.Printf("Error getting node info for node %d: %v, output: %s", i, err, string(nodeInfoOutput))

scripts/test.mk

@@ -24,7 +24,7 @@ test-integration:
 ## test-e2e: Running e2e tests
 test-e2e: build build-da build-evm-single
 	@echo "--> Running e2e tests"
-	@cd test/e2e && go test -mod=readonly -failfast -timeout=15m -tags='e2e evm' ./... --binary=$(CURDIR)/build/testapp --evm-binary=$(CURDIR)/build/evm-single
+	@cd test/e2e && go test -mod=readonly -failfast -timeout=15m -tags='e2e evm' -v ./... --binary=$(CURDIR)/build/testapp --evm-binary=$(CURDIR)/build/evm-single
 .PHONY: test-e2e
 
 ## test-integration-cover: generate code coverage report for integration tests.