Fix timestamp stored in exit_root table (0xPolygonHermez#2811)

* Fix timestamp stored in exit_root table * json doc
superksx · Nov 23, 2023 · 4bd8c1f · 4bd8c1f
1 parent 84ac067
commit 4bd8c1f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -469,12 +469,14 @@ func (etherMan *Client) updateGlobalExitRootEvent(ctx context.Context, vLog type
 	gExitRoot.BlockNumber = vLog.BlockNumber
 	gExitRoot.GlobalExitRoot = hash(globalExitRoot.MainnetExitRoot, globalExitRoot.RollupExitRoot)
 
+	fullBlock, err := etherMan.EthClient.BlockByHash(ctx, vLog.BlockHash)
+	if err != nil {
+		return fmt.Errorf("error getting hashParent. BlockNumber: %d. Error: %w", vLog.BlockNumber, err)
+	}
+	t := time.Unix(int64(fullBlock.Time()), 0)
+	gExitRoot.Timestamp = t
+
 	if len(*blocks) == 0 || ((*blocks)[len(*blocks)-1].BlockHash != vLog.BlockHash || (*blocks)[len(*blocks)-1].BlockNumber != vLog.BlockNumber) {
-		fullBlock, err := etherMan.EthClient.BlockByHash(ctx, vLog.BlockHash)
-		if err != nil {
-			return fmt.Errorf("error getting hashParent. BlockNumber: %d. Error: %w", vLog.BlockNumber, err)
-		}
-		t := time.Unix(int64(fullBlock.Time()), 0)
 		block := prepareBlock(vLog, t, fullBlock)
 		block.GlobalExitRoots = append(block.GlobalExitRoots, gExitRoot)
 		*blocks = append(*blocks, block)

diff --git a/etherman/types.go b/etherman/types.go
@@ -27,6 +27,7 @@ type GlobalExitRoot struct {
 	MainnetExitRoot common.Hash
 	RollupExitRoot  common.Hash
 	GlobalExitRoot  common.Hash
+	Timestamp       time.Time
 }
 
 // SequencedBatch represents virtual batch

diff --git a/synchronizer/synchronizer.go b/synchronizer/synchronizer.go
@@ -1317,6 +1317,7 @@ func (s *ClientSynchronizer) processGlobalExitRoot(globalExitRoot etherman.Globa
 		MainnetExitRoot: globalExitRoot.MainnetExitRoot,
 		RollupExitRoot:  globalExitRoot.RollupExitRoot,
 		GlobalExitRoot:  globalExitRoot.GlobalExitRoot,
+		Timestamp:       globalExitRoot.Timestamp,
 	}
 	err := s.state.AddGlobalExitRoot(s.ctx, &ger, dbTx)
 	if err != nil {