Fetch upstream v0.6.4

aggregator/aggregator.go

@@ -39,6 +39,8 @@ const (
 
 	ethTxManagerOwner = "aggregator"
 	monitoredIDFormat = "proof-from-%v-to-%v"
+
+	forkId9 = uint64(9)
 )
 
 type finalProofMsg struct {
@@ -194,7 +196,7 @@ func (a *Aggregator) Channel(stream prover.AggregatorService_ChannelServer) erro
 	log.Info("Establishing stream connection with prover")
 
 	// Check if prover supports the required Fork ID
-	if !prover.SupportsForkID(a.cfg.ForkId) {
+	if !prover.SupportsForkID(forkId9) {
 		err := errors.New("prover does not support required fork ID")
 		log.Warn(FirstToUpper(err.Error()))
 		return err
@@ -1149,9 +1151,13 @@ func (a *Aggregator) buildInputProver(ctx context.Context, batchToVerify *state.
 		for _, l2blockRaw := range batchRawData.Blocks {
 			_, contained := l1InfoTreeData[l2blockRaw.IndexL1InfoTree]
 			if !contained && l2blockRaw.IndexL1InfoTree != 0 {
-				l1InfoTreeExitRootStorageEntry, err := a.State.GetL1InfoRootLeafByIndex(ctx, l2blockRaw.IndexL1InfoTree, nil)
-				if err != nil {
-					return nil, err
+				l1InfoTreeExitRootStorageEntry := state.L1InfoTreeExitRootStorageEntry{}
+				l1InfoTreeExitRootStorageEntry.Timestamp = time.Unix(0, 0)
+				if l2blockRaw.IndexL1InfoTree <= leaves[len(leaves)-1].L1InfoTreeIndex {
+					l1InfoTreeExitRootStorageEntry, err = a.State.GetL1InfoRootLeafByIndex(ctx, l2blockRaw.IndexL1InfoTree, nil)
+					if err != nil {
+						return nil, err
+					}
 				}
 
 				// Calculate smt proof
@@ -1204,7 +1210,7 @@ func (a *Aggregator) buildInputProver(ctx context.Context, batchToVerify *state.
 			OldAccInputHash:   previousBatch.AccInputHash.Bytes(),
 			OldBatchNum:       previousBatch.BatchNumber,
 			ChainId:           a.cfg.ChainID,
-			ForkId:            a.cfg.ForkId,
+			ForkId:            forkId9,
 			BatchL2Data:       batchToVerify.BatchL2Data,
 			L1InfoRoot:        l1InfoRoot.Bytes(),
 			TimestampLimit:    uint64(batchToVerify.Timestamp.Unix()),

docker-compose.yml

@@ -107,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:v5.0.6
+    image: hermeznetwork/zkevm-prover:v6.0.0
     depends_on:
       zkevm-state-db:
         condition: service_healthy

l1infotree/tree.go

@@ -84,16 +84,13 @@ func (mt *L1InfoTree) ComputeMerkleProof(gerIndex uint32, leaves [][32]byte) ([]
 		if len(leaves)%2 == 1 {
 			leaves = append(leaves, mt.zeroHashes[h])
 		}
-		if index%2 == 1 { //If it is odd
-			siblings = append(siblings, leaves[index-1])
-		} else { // It is even
-			if len(leaves) > 1 {
-				if index >= uint32(len(leaves)) {
-					// siblings = append(siblings, mt.zeroHashes[h])
-					siblings = append(siblings, leaves[index-1])
-				} else {
-					siblings = append(siblings, leaves[index+1])
-				}
+		if index >= uint32(len(leaves)) {
+			siblings = append(siblings, mt.zeroHashes[h])
+		} else {
+			if index%2 == 1 { //If it is odd
+				siblings = append(siblings, leaves[index-1])
+			} else { // It is even
+				siblings = append(siblings, leaves[index+1])
 			}
 		}
 		var (

sequencer/finalizer.go

@@ -222,11 +222,19 @@ func (f *finalizer) updateFlushIDs(newPendingFlushID, newStoredFlushID uint64) {
 
 func (f *finalizer) checkL1InfoTreeUpdate(ctx context.Context) {
 	firstL1InfoRootUpdate := true
+	skipFirstSleep := true
 
 	for {
+		if skipFirstSleep {
+			skipFirstSleep = false
+		} else {
+			time.Sleep(f.cfg.L1InfoTreeCheckInterval.Duration)
+		}
+
 		lastL1BlockNumber, err := f.etherman.GetLatestBlockNumber(ctx)
 		if err != nil {
 			log.Errorf("error getting latest L1 block number, error: %v", err)
+			continue
 		}
 
 		maxBlockNumber := uint64(0)
@@ -246,9 +254,30 @@ func (f *finalizer) checkL1InfoTreeUpdate(ctx context.Context) {
 		}
 
 		if firstL1InfoRootUpdate || l1InfoRoot.L1InfoTreeIndex > f.lastL1InfoTree.L1InfoTreeIndex {
-			firstL1InfoRootUpdate = false
+			log.Infof("received new L1InfoRoot, l1InfoTreeIndex: %d, l1InfoTreeRoot: %s, l1Block: %d",
+				l1InfoRoot.L1InfoTreeIndex, l1InfoRoot.L1InfoTreeRoot, l1InfoRoot.BlockNumber)
 
-			log.Debugf("received new L1InfoRoot. L1InfoTreeIndex: %d", l1InfoRoot.L1InfoTreeIndex)
+			// Sanity check l1BlockState (l1InfoRoot.BlockNumber) blockhash matches blockhash on ethereum. We skip it if l1InfoRoot.BlockNumber == 0 (empty tree)
+			if l1InfoRoot.BlockNumber > 0 {
+				l1BlockState, err := f.stateIntf.GetBlockByNumber(ctx, l1InfoRoot.BlockNumber, nil)
+				if err != nil {
+					log.Errorf("error getting L1 block %d from the state, error: %v", l1InfoRoot.BlockNumber, err)
+					continue
+				}
+
+				l1BlockEth, err := f.etherman.HeaderByNumber(ctx, new(big.Int).SetUint64(l1InfoRoot.BlockNumber))
+				if err != nil {
+					log.Errorf("error getting L1 block %d from ethereum, error: %v", l1InfoRoot.BlockNumber, err)
+					continue
+				}
+				if l1BlockState.BlockHash != l1BlockEth.Hash() {
+					log.Warnf("skipping use of l1InfoTreeIndex %d, L1 block %d blockhash %s doesn't match blockhash on ethereum %s (L1 reorg?)",
+						l1InfoRoot.L1InfoTreeIndex, l1InfoRoot.BlockNumber, l1BlockState.BlockHash, l1BlockEth.Hash())
+					continue
+				}
+			}
+
+			firstL1InfoRootUpdate = false
 
 			f.lastL1InfoTreeMux.Lock()
 			f.lastL1InfoTree = l1InfoRoot
@@ -261,8 +290,6 @@ func (f *finalizer) checkL1InfoTreeUpdate(ctx context.Context) {
 				f.lastL1InfoTreeCond.L.Unlock()
 			}
 		}
-
-		time.Sleep(f.cfg.L1InfoTreeCheckInterval.Duration)
 	}
 }
 

sequencer/interfaces.go

@@ -35,6 +35,7 @@ type etherman interface {
 	TrustedSequencer() (common.Address, error)
 	GetLatestBatchNumber() (uint64, error)
 	GetLatestBlockNumber(ctx context.Context) (uint64, error)
+	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
 }
 
 // stateInterface gathers the methods required to interact with the state.

state/batchV2.go

@@ -310,6 +310,7 @@ func (s *State) sendBatchRequestToExecutorV2(ctx context.Context, batchRequest *
 			log.Warn(batchResponseToString)
 			s.eventLog.LogExecutorErrorV2(ctx, batchResponse.Error, batchRequest)
 		} else if batchResponse.ErrorRom != executor.RomError_ROM_ERROR_NO_ERROR && executor.IsROMOutOfCountersError(batchResponse.ErrorRom) {
+			err = executor.RomErr(batchResponse.ErrorRom)
 			log.Warnf("executor batch %d response, ROM OOC, error: %v", newBatchNum, err)
 			log.Warn(batchResponseToString)
 		} else if batchResponse.ErrorRom != executor.RomError_ROM_ERROR_NO_ERROR {

state/forkid.go

@@ -17,6 +17,8 @@ const (
 	FORKID_ETROG = 7
 	// FORKID_ELDERBERRY is the fork id 8
 	FORKID_ELDERBERRY = 8
+	// FORKID_9 is the fork id 9
+	FORKID_9 = 9
 )
 
 // ForkIDInterval is a fork id interval