New BatchLiquidator optimized for L2 rollups

manifest.json

@@ -4,51 +4,65 @@
   "networks": {
     "1": {
       "name": "Ethereum",
+      "network_type": "evm",
       "cid": "QmUggirxXTV5G9KTYHiEP6tBG9KAG1Vm3h72cefSc28bwa"
     },
     "5": {
       "name": "Goerli Testnet",
+      "network_type": "evm",
       "cid": "Qmbpqqpj56gqVEvtCq32dHLzHMoVQMsFQem5KnsJdndtQT"
     },
     "10": {
       "name": "Optimism",
+      "network_type": "evm-l2",
       "cid": "QmdDfTM14oN3RgC16ZZz93WdDPBr7aJdxeYVXfnFNdzJFS"
     },
     "56": {
       "name": "Binance Smart Chain",
+      "network_type": "evm",
       "cid": "QmdoaYxpBw1td47wLcHUYwKwpMTE22Zo74RsxtmZ73V1AV"
     },
     "100": {
       "name": "Gnosis Chain",
+      "network_type": "evm",
       "cid": "QmSNNNDfsYB8XDVH3Lrmhh5PVSSFq9YKpUjxe3titZPqRp"
     },
     "137": {
       "name": "Polygon",
+      "network_type": "evm",
       "cid": "QmZbCG6MHbjACuB8h2oQr6fB3D9UKJw1yQUADnAwW9apQ3"
     },
     "420": {
-      "name": "Optimism Goerli Testnet"
+      "name": "Optimism Goerli Testnet",
+      "network_type": "evm-l2"
     },
     "42161": {
+      "name": "Arbitrum One",
+      "network_type": "evm-l2",
       "cid": "QmajKn6sEwaMjcoFv1qque7QZ4WuZMWJ8PLLxTg4BJMHRd"
     },
     "42220": {
-      "name": "Celo"
+      "name": "Celo",
+      "network_type": "evm"
     },
     "43113": {
       "name": "Avalanche Fuji Testnet",
+      "network_type": "evm",
       "cid": "QmcEDXzuTRQqAQyPxKagJ6P2ZAvFHCZWgqLh2ztSzidY83"
     },
     "43114": {
       "name": "Avalanche C-Chain",
+      "network_type": "evm",
       "cid": "QmWEQCvA8wCM1KFKBFdb3ETHYWHR6vfubbjqFVdkkHqQXL"
     },
     "80001": {
       "name": "Polygon Mumbai Testnet",
+      "network_type": "evm",
       "cid": "QmX4GA1DLoorKJ5B4TvgTkNV8JvbjtuFcu21EphCvQx1tJ"
     },
     "421613": {
-      "name": "Arbitrum Goerli Testnet"
+      "name": "Arbitrum Goerli Testnet",
+      "network_type": "evm-l2"
     }
   }
 }

package.json

@@ -27,7 +27,7 @@
     "@decentral.ee/web3-helpers": "^0.5.3",
     "@superfluid-finance/ethereum-contracts": "1.0.0",
     "@superfluid-finance/js-sdk": "0.5.12",
-    "@superfluid-finance/metadata": "git+https://github.com/superfluid-finance/metadata.git",
+    "@superfluid-finance/metadata": "github:superfluid-finance/metadata#BatchLiquidatorV2",
     "@truffle/contract": "^4.4.2",
     "async": "^3.2.2",
     "axios": "^0.24.0",

src/boot/loadEvents.js

@@ -15,41 +15,37 @@ class LoadEvents {
       let blockNumber = lastEventBlockNumber === null
         ? parseInt(this.app.config.EPOCH_BLOCK)
         : lastEventBlockNumber.blockNumber;
+
       if (systemInfo !== null) {
-        if (systemInfo.superTokenBlockNumber > blockNumber) {
-          blockNumber = systemInfo.superTokenBlockNumber;
-        }
-        if ((await this.app.client.getChainId()) !== systemInfo.chainId) {
+        blockNumber = Math.max(blockNumber, systemInfo.superTokenBlockNumber);
+        const currentChainId = await this.app.client.getChainId();
+        if (currentChainId !== systemInfo.chainId) {
           throw new Error("different network than from the saved data");
         }
       }
+
       let pullCounter = blockNumber;
       const currentBlockNumber = await this.app.client.getCurrentBlockNumber(this.app.config.BLOCK_OFFSET);
-      const testBlockNumber = await this.app.client.getCurrentBlockNumber(0);
-      this.app.logger.info(`scanning blocks from ${pullCounter} to ${currentBlockNumber} - real ${testBlockNumber}`);
+      const realBlockNumber = await this.app.client.getCurrentBlockNumber();
+      this.app.logger.info(`scanning blocks from ${pullCounter} to ${currentBlockNumber} - real ${realBlockNumber}`);
+
       const queue = async.queue(async function (task) {
         let keepTrying = 1;
         while (true) {
           try {
             task.self.app.logger.info(`getting blocks: trying #${keepTrying} - from:${task.fromBlock} to:${task.toBlock}`);
-            let query = {
-              fromBlock: task.fromBlock,
-              toBlock: task.toBlock
-            };
-            if (task.self.app.config.TOKENS) {
-              query = {
-                filter: {
-                  token: task.self.app.config.TOKENS
-                },
-                fromBlock: task.fromBlock,
-                toBlock: task.toBlock
-              };
-            }
+
+            const query = task.self.app.config.TOKENS
+                ? { filter: { token: task.self.app.config.TOKENS }, fromBlock: task.fromBlock, toBlock: task.toBlock }
+                : { fromBlock: task.fromBlock, toBlock: task.toBlock };
+
             let result = await task.self.app.protocol.getAgreementEvents("FlowUpdated", query);
             result = result.map(task.self.app.models.event.transformWeb3Event);
+
             for (const event of result) {
               const agreementId = task.self.app.protocol.generateId(event.sender, event.receiver);
               const hashId = task.self.app.protocol.generateId(event.token, agreementId);
+
               await task.self.app.db.models.FlowUpdatedModel.create({
                 address: event.address,
                 blockNumber: event.blockNumber,
@@ -67,27 +63,27 @@ class LoadEvents {
             task.self.app.logger.error(err);
             // this often happens due to RPC rate limiting, thus it's wise to add some delay here
             await this.app.timer.timeout(keepTrying * 1000); // linear backoff
+
             if (keepTrying > task.self.app.config.NUM_RETRIES) {
               process.exit(1);
             }
           }
         }
       }, this.app.config.CONCURRENCY);
-
+      //
       while (pullCounter <= currentBlockNumber) {
         const end = (pullCounter + parseInt(this.app.config.MAX_QUERY_BLOCK_RANGE));
-        queue.push({
-          self: this,
-          fromBlock: pullCounter,
-          toBlock: end > currentBlockNumber ? currentBlockNumber : end
-        });
+        queue.push({self: this, fromBlock: pullCounter, toBlock: end > currentBlockNumber ? currentBlockNumber : end });
         pullCounter = end + 1;
       }
+
       await queue.drain();
+
       const tokens = await this.app.db.models.FlowUpdatedModel.findAll({
         attributes: ["superToken"],
         group: ["superToken"]
       });
+
       // fresh database
       if (systemInfo === null) {
         await this.app.db.models.SystemModel.create({