update event watcher

Author: colinlyguo

Jenkinsfile

@@ -47,11 +47,11 @@ pipeline {
                         sh 'make -C bridge docker'
                     }
                 }
-                stage('Check Coordinator Docker Build') {
-                    steps {
-                        sh 'make -C coordinator docker'
-                    }
-                }
+                //stage('Check Coordinator Docker Build') {
+                //    steps {
+                //        sh 'make -C coordinator docker'
+                //    }
+                //}
                 stage('Check Database Docker Build') {
                     steps {
                         sh 'make -C database docker'

bridge/abi/bridge_abi.go

@@ -23,6 +23,9 @@ const (
 	// CommitBatchEventSignature = keccak256("CommitBatch(bytes32)")
 	CommitBatchEventSignature = "2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"
 
+	// CommitBatchesEventSignature = keccak256("CommitBatches(bytes32)")
+	CommitBatchesEventSignature = "188adc06d38d0173d973ad47531a02ad89cd941508eab21b3d41f3bb41bf9eb9"
+
 	// FinalizedBatchEventSignature = keccak256("FinalizeBatch(bytes32)")
 	FinalizedBatchEventSignature = "6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"
 )

bridge/l1/watcher.go

@@ -222,7 +222,8 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		query.Topics[0][1] = common.HexToHash(bridge_abi.RelayedMessageEventSignature)
 		query.Topics[0][2] = common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature)
 		query.Topics[0][3] = common.HexToHash(bridge_abi.CommitBatchEventSignature)
-		query.Topics[0][4] = common.HexToHash(bridge_abi.FinalizedBatchEventSignature)
+		query.Topics[0][4] = common.HexToHash(bridge_abi.CommitBatchesEventSignature)
+		query.Topics[0][5] = common.HexToHash(bridge_abi.FinalizedBatchEventSignature)
 
 		logs, err := w.client.FilterLogs(w.ctx, query)
 		if err != nil {
@@ -365,10 +366,8 @@ func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Messag
 			})
 		case common.HexToHash(bridge_abi.CommitBatchEventSignature):
 			event := struct {
-				BatchID    common.Hash
-				BatchHash  common.Hash
-				BatchIndex *big.Int
-				ParentHash common.Hash
+				BatchID   common.Hash
+				BatchHash common.Hash
 			}{}
 			// BatchID is in topics[1]
 			event.BatchID = common.HexToHash(vLog.Topics[1].String())
@@ -378,17 +377,33 @@ func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Messag
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
 
+			rollupEvents = append(rollupEvents, rollupEvent{
+				batchID: event.BatchID,
+				txHash:  vLog.TxHash,
+				status:  types.RollupCommitted,
+			})
+		case common.HexToHash(bridge_abi.CommitBatchesEventSignature):
+			event := struct {
+				BatchID   common.Hash
+				BatchHash common.Hash
+			}{}
+			// BatchID is in topics[1]
+			event.BatchID = common.HexToHash(vLog.Topics[1].String())
+			err := w.scrollchainABI.UnpackIntoInterface(&event, "CommitBatches", vLog.Data)
+			if err != nil {
+				log.Warn("Failed to unpack layer1 CommitBatches event", "err", err)
+				return l1Messages, relayedMessages, rollupEvents, err
+			}
+
 			rollupEvents = append(rollupEvents, rollupEvent{
 				batchID: event.BatchID,
 				txHash:  vLog.TxHash,
 				status:  types.RollupCommitted,
 			})
 		case common.HexToHash(bridge_abi.FinalizedBatchEventSignature):
 			event := struct {
-				BatchID    common.Hash
-				BatchHash  common.Hash
-				BatchIndex *big.Int
-				ParentHash common.Hash
+				BatchID   common.Hash
+				BatchHash common.Hash
 			}{}
 			// BatchID is in topics[1]
 			event.BatchID = common.HexToHash(vLog.Topics[1].String())

bridge/l2/relayer.go

@@ -352,9 +352,9 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 	calldata, err := r.l1RollupABI.Pack("commitBatches", commitBatches)
 	if err != nil {
 		log.Error("Failed to pack commitBatches",
-				  "error", err,
-				  "start_batch_index", commitBatches[0].BatchIndex,
-				  "end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
+			"error", err,
+			"start_batch_index", commitBatches[0].BatchIndex,
+			"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
 		return err
 	}
 
@@ -372,9 +372,9 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 		return err
 	}
 	log.Info("Sent the commitBatches tx to layer1",
-			 "hash", txHash,
-			 "start_batch_index", commitBatches[0].BatchIndex,
-			 "end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
+		"hash", txHash,
+		"start_batch_index", commitBatches[0].BatchIndex,
+		"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
 
 	// record and sync with db, @todo handle db error
 	batchHashes := make([]string, len(batchData))