fixed using correct blocks root for batch end (#853)

0xPolygonHermez · Jul 26, 2024 · 9746252 · 9746252
1 parent f81e00f
commit 9746252
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/zk/datastream/client/stream_client.go b/zk/datastream/client/stream_client.go
@@ -259,7 +259,7 @@ func (c *StreamClient) ReadAllEntriesToChannel() error {
 		}
 
 		// reset the channels as there could be data ahead of the bookmark we want to track here.
-		c.resetChannels()
+		// c.resetChannels()
 
 		return err2
 	}

diff --git a/zk/datastream/server/data_stream_server.go b/zk/datastream/server/data_stream_server.go
@@ -181,8 +181,8 @@ func createBlockWithBatchCheckStreamEntriesProto(
 			if err != nil {
 				return nil, err
 			}
-			blockRoot := block.Root()
-			if endEntriesProto, err = addBatchEndEntriesProto(lastBatchNumber, &blockRoot, gers, &localExitRoot); err != nil {
+			lastBlockRoot := lastBlock.Root()
+			if endEntriesProto, err = addBatchEndEntriesProto(lastBatchNumber, &lastBlockRoot, gers, &localExitRoot); err != nil {
 				return nil, err
 			}
 		}

diff --git a/zk/datastream/types/batch_proto.go b/zk/datastream/types/batch_proto.go
@@ -77,6 +77,7 @@ func UnmarshalBatchEnd(data []byte) (*BatchEnd, error) {
 	}
 
 	return &BatchEnd{
+		Number:        batchEnd.Number,
 		LocalExitRoot: libcommon.BytesToHash(batchEnd.LocalExitRoot),
 		StateRoot:     libcommon.BytesToHash(batchEnd.StateRoot),
 		Debug:         ProcessDebug(batchEnd.Debug),