From 8a3a4fbc6c40a58d0875e87a3079565a5ef20111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toni=20Ram=C3=ADrez?=
 <58293609+ToniRamirezM@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:18:47 +0200
Subject: [PATCH] Fix encodng tx in stream (#2629)

* Fixes Tx encoding in data stream

* fix
---
 sequencer/dbmanager.go | 9 +++++++--
 sequencer/sequencer.go | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sequencer/dbmanager.go b/sequencer/dbmanager.go
index be88655bcf..1928182a09 100644
--- a/sequencer/dbmanager.go
+++ b/sequencer/dbmanager.go
@@ -319,11 +319,16 @@ func (d *dbManager) StoreProcessedTxAndDeleteFromPool(ctx context.Context, tx tr
 			StateRoot:      l2BlockHeader.Root,
 		}
 
+		binaryTxData, err := tx.response.Tx.MarshalBinary()
+		if err != nil {
+			return err
+		}
+
 		l2Transaction := state.DSL2Transaction{
 			EffectiveGasPricePercentage: uint8(tx.response.EffectivePercentage),
 			IsValid:                     1,
-			EncodedLength:               uint32(len(txData)),
-			Encoded:                     txData,
+			EncodedLength:               uint32(len(binaryTxData)),
+			Encoded:                     binaryTxData,
 		}
 
 		d.dataToStream <- state.DSL2FullBlock{
diff --git a/sequencer/sequencer.go b/sequencer/sequencer.go
index 4538754b7a..d0df152ebe 100644
--- a/sequencer/sequencer.go
+++ b/sequencer/sequencer.go
@@ -240,9 +240,6 @@ func (s *Sequencer) updateDataStreamerFile(ctx context.Context, streamServer *da
 	}
 
 	log.Infof("Current transaction index: %d", currentTxIndex)
-	if currentTxIndex == 0 {
-		currentL2Block++
-	}
 	log.Infof("Current L2 block number: %d", currentL2Block)
 
 	var limit uint64 = 1000