fix + minor refactor (#577)

etherman/etherman.go

@@ -169,21 +169,25 @@ func NewClient(cfg Config, polygonBridgeAddr, polygonZkEVMGlobalExitRootAddress,
 }
 
 // NewL2Client creates a new etherman for L2.
-func NewL2Client(url string, bridgeAddr common.Address) (*Client, error) {
+func NewL2Client(url string, polygonBridgeAddr common.Address) (*Client, error) {
 	// Connect to ethereum node
 	ethClient, err := ethclient.Dial(url)
 	if err != nil {
 		log.Errorf("error connecting to %s: %+v", url, err)
 		return nil, err
 	}
 	// Create smc clients
-	bridge, err := polygonzkevmbridge.NewPolygonzkevmbridge(bridgeAddr, ethClient)
+	bridge, err := polygonzkevmbridge.NewPolygonzkevmbridge(polygonBridgeAddr, ethClient)
 	if err != nil {
 		return nil, err
 	}
-	scAddresses := []common.Address{bridgeAddr}
+	oldpolygonBridge, err := oldpolygonzkevmbridge.NewOldpolygonzkevmbridge(polygonBridgeAddr, ethClient)
+	if err != nil {
+		return nil, err
+	}
+	scAddresses := []common.Address{polygonBridgeAddr}
 
-	return &Client{EtherClient: ethClient, PolygonBridge: bridge, SCAddresses: scAddresses}, nil
+	return &Client{EtherClient: ethClient, PolygonBridge: bridge, OldPolygonBridge: oldpolygonBridge, SCAddresses: scAddresses}, nil
 }
 
 // GetRollupInfoByBlockRange function retrieves the Rollup information that are included in all this ethereum blocks

synchronizer/synchronizer.go

@@ -34,7 +34,6 @@ type ClientSynchronizer struct {
 	chSynced         chan uint
 	zkEVMClient      zkEVMClientInterface
 	synced           bool
-	isLxLyEtrog      bool
 	l1RollupExitRoot common.Hash
 }
 
@@ -73,7 +72,6 @@ func NewSynchronizer(
 	}
 	if networkID == 0 {
 		return &ClientSynchronizer{
-			isLxLyEtrog:      isActivated,
 			bridgeCtrl:       bridge,
 			storage:          storage.(storageInterface),
 			etherMan:         ethMan,
@@ -89,7 +87,6 @@ func NewSynchronizer(
 		}, nil
 	}
 	return &ClientSynchronizer{
-		isLxLyEtrog:    isActivated,
 		bridgeCtrl:     bridge,
 		storage:        storage.(storageInterface),
 		etherMan:       ethMan,
@@ -367,10 +364,8 @@ func (s *ClientSynchronizer) processBlockRange(blocks []etherman.Block, order ma
 					return err
 				}
 			case etherman.ActivateEtrogOrder:
-				s.activateLxLyEtrog()
-				if err != nil {
-					return err
-				}
+				// this is activated when the bridge detects the CreateNewRollup or the AddExistingRollup event from the rollupManager
+				log.Info("Event received. Activating LxLyEtrog...")
 			}
 		}
 		err = s.storage.Commit(s.ctx, dbTx)
@@ -670,9 +665,3 @@ func (s *ClientSynchronizer) processTokenWrapped(tokenWrapped etherman.TokenWrap
 	}
 	return nil
 }
-
-func (s *ClientSynchronizer) activateLxLyEtrog() {
-	// this is activated when the bridge detects the CreateNewRollup or the AddExistingRollup event from the rollupManager
-	log.Info("Event received. Activating LxLyEtrog...")
-	s.isLxLyEtrog = true
-}