@gearbox-protocol/sdk 9.9.0 → 9.9.1

package/dist/cjs/sdk/GearboxSDK.js

@@ -414,64 +414,77 @@ class GearboxSDK {
       return;
     }
     if (this.#syncing) {
-      this.logger?.warn(`cannot sync to ${blockNumber}, already syncing`);
+      this.logger?.warn(
+        `cannot sync to ${blockNumber}, already syncing at ${this.currentBlock}`
+      );
       return;
     }
     this.#syncing = true;
-    let delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
-    this.logger?.debug(
-      `syncing state to block ${blockNumber} (delta ${delta}s )...`
-    );
-    const watchAddresses = [
-      ...Array.from(this.marketRegister.watchAddresses),
-      this.addressProvider.address
-    ];
-    const fromBlock = this.currentBlock + 1n;
-    this.logger?.debug(
-      `getting logs from ${watchAddresses.length} addresses in [${fromBlock}:${blockNumber}]`
-    );
-    const logs = await (0, import_viem2.getLogsSafe)(this.provider.publicClient, {
-      fromBlock,
-      toBlock: blockNumber,
-      address: watchAddresses
-    });
-    for (const log of logs) {
-      const contract = this.contracts.get(log.address);
-      if (contract) {
-        const event = (0, import_viem.parseEventLogs)({
-          abi: contract.abi,
-          logs: [log]
-        })[0];
-        contract.processLog(event);
-      }
-    }
-    this.#currentBlock = blockNumber;
-    this.#timestamp = timestamp;
-    await this.marketRegister.syncState(skipPriceUpdate);
-    await this.#hooks.triggerHooks("syncState", { blockNumber, timestamp });
-    const pluginsList = import_utils.TypedObjectUtils.entries(this.plugins);
-    const pluginResponse = await Promise.allSettled(
-      pluginsList.map(([name, plugin]) => {
-        if (plugin.syncState) {
-          this.logger?.debug(`syncing plugin ${name}`);
-          return plugin.syncState();
+    const prevBlock = this.currentBlock;
+    const prevTimestamp = this.timestamp;
+    try {
+      let delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
+      this.logger?.debug(
+        `syncing state to block ${blockNumber} (delta ${delta}s )...`
+      );
+      const watchAddresses = [
+        ...Array.from(this.marketRegister.watchAddresses),
+        this.addressProvider.address
+      ];
+      const fromBlock = this.currentBlock + 1n;
+      this.logger?.debug(
+        `getting logs from ${watchAddresses.length} addresses in [${fromBlock}:${blockNumber}]`
+      );
+      const logs = await (0, import_viem2.getLogsSafe)(this.provider.publicClient, {
+        fromBlock,
+        toBlock: blockNumber,
+        address: watchAddresses
+      });
+      for (const log of logs) {
+        const contract = this.contracts.get(log.address);
+        if (contract) {
+          const event = (0, import_viem.parseEventLogs)({
+            abi: contract.abi,
+            logs: [log]
+          })[0];
+          contract.processLog(event);
         }
-        return void 0;
-      })
-    );
-    pluginResponse.forEach((r, i) => {
-      const [name, plugin] = pluginsList[i];
-      if (plugin.syncState && r.status === "fulfilled") {
-        this.logger?.debug(`synced plugin ${name}`);
-      } else if (plugin.syncState && r.status === "rejected") {
-        this.logger?.error(r.reason, `failed to sync plugin ${name}`);
       }
-    });
-    this.#syncing = false;
-    delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
-    this.logger?.debug(
-      `synced state to block ${blockNumber} (delta ${delta}s)`
-    );
+      this.#currentBlock = blockNumber;
+      this.#timestamp = timestamp;
+      await this.marketRegister.syncState(skipPriceUpdate);
+      await this.#hooks.triggerHooks("syncState", { blockNumber, timestamp });
+      const pluginsList = import_utils.TypedObjectUtils.entries(this.plugins);
+      const pluginResponse = await Promise.allSettled(
+        pluginsList.map(([name, plugin]) => {
+          if (plugin.syncState) {
+            this.logger?.debug(`syncing plugin ${name}`);
+            return plugin.syncState();
+          }
+          return void 0;
+        })
+      );
+      pluginResponse.forEach((r, i) => {
+        const [name, plugin] = pluginsList[i];
+        if (plugin.syncState && r.status === "fulfilled") {
+          this.logger?.debug(`synced plugin ${name}`);
+        } else if (plugin.syncState && r.status === "rejected") {
+          this.logger?.error(r.reason, `failed to sync plugin ${name}`);
+        }
+      });
+      delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
+      this.logger?.debug(
+        `synced state to block ${blockNumber} (delta ${delta}s)`
+      );
+    } catch (e) {
+      this.logger?.error(
+        `sync state to block ${blockNumber} with ts ${timestamp} failed, reverting to old block ${prevBlock} with ts ${prevTimestamp}: ${e}`
+      );
+      this.#currentBlock = prevBlock;
+      this.#timestamp = prevTimestamp;
+    } finally {
+      this.#syncing = false;
+    }
   }
   get provider() {
     return this.#provider;

package/dist/esm/sdk/GearboxSDK.js

@@ -412,64 +412,77 @@ class GearboxSDK {
       return;
     }
     if (this.#syncing) {
-      this.logger?.warn(`cannot sync to ${blockNumber}, already syncing`);
+      this.logger?.warn(
+        `cannot sync to ${blockNumber}, already syncing at ${this.currentBlock}`
+      );
       return;
     }
     this.#syncing = true;
-    let delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
-    this.logger?.debug(
-      `syncing state to block ${blockNumber} (delta ${delta}s )...`
-    );
-    const watchAddresses = [
-      ...Array.from(this.marketRegister.watchAddresses),
-      this.addressProvider.address
-    ];
-    const fromBlock = this.currentBlock + 1n;
-    this.logger?.debug(
-      `getting logs from ${watchAddresses.length} addresses in [${fromBlock}:${blockNumber}]`
-    );
-    const logs = await getLogsSafe(this.provider.publicClient, {
-      fromBlock,
-      toBlock: blockNumber,
-      address: watchAddresses
-    });
-    for (const log of logs) {
-      const contract = this.contracts.get(log.address);
-      if (contract) {
-        const event = parseEventLogs({
-          abi: contract.abi,
-          logs: [log]
-        })[0];
-        contract.processLog(event);
-      }
-    }
-    this.#currentBlock = blockNumber;
-    this.#timestamp = timestamp;
-    await this.marketRegister.syncState(skipPriceUpdate);
-    await this.#hooks.triggerHooks("syncState", { blockNumber, timestamp });
-    const pluginsList = TypedObjectUtils.entries(this.plugins);
-    const pluginResponse = await Promise.allSettled(
-      pluginsList.map(([name, plugin]) => {
-        if (plugin.syncState) {
-          this.logger?.debug(`syncing plugin ${name}`);
-          return plugin.syncState();
+    const prevBlock = this.currentBlock;
+    const prevTimestamp = this.timestamp;
+    try {
+      let delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
+      this.logger?.debug(
+        `syncing state to block ${blockNumber} (delta ${delta}s )...`
+      );
+      const watchAddresses = [
+        ...Array.from(this.marketRegister.watchAddresses),
+        this.addressProvider.address
+      ];
+      const fromBlock = this.currentBlock + 1n;
+      this.logger?.debug(
+        `getting logs from ${watchAddresses.length} addresses in [${fromBlock}:${blockNumber}]`
+      );
+      const logs = await getLogsSafe(this.provider.publicClient, {
+        fromBlock,
+        toBlock: blockNumber,
+        address: watchAddresses
+      });
+      for (const log of logs) {
+        const contract = this.contracts.get(log.address);
+        if (contract) {
+          const event = parseEventLogs({
+            abi: contract.abi,
+            logs: [log]
+          })[0];
+          contract.processLog(event);
         }
-        return void 0;
-      })
-    );
-    pluginResponse.forEach((r, i) => {
-      const [name, plugin] = pluginsList[i];
-      if (plugin.syncState && r.status === "fulfilled") {
-        this.logger?.debug(`synced plugin ${name}`);
-      } else if (plugin.syncState && r.status === "rejected") {
-        this.logger?.error(r.reason, `failed to sync plugin ${name}`);
       }
-    });
-    this.#syncing = false;
-    delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
-    this.logger?.debug(
-      `synced state to block ${blockNumber} (delta ${delta}s)`
-    );
+      this.#currentBlock = blockNumber;
+      this.#timestamp = timestamp;
+      await this.marketRegister.syncState(skipPriceUpdate);
+      await this.#hooks.triggerHooks("syncState", { blockNumber, timestamp });
+      const pluginsList = TypedObjectUtils.entries(this.plugins);
+      const pluginResponse = await Promise.allSettled(
+        pluginsList.map(([name, plugin]) => {
+          if (plugin.syncState) {
+            this.logger?.debug(`syncing plugin ${name}`);
+            return plugin.syncState();
+          }
+          return void 0;
+        })
+      );
+      pluginResponse.forEach((r, i) => {
+        const [name, plugin] = pluginsList[i];
+        if (plugin.syncState && r.status === "fulfilled") {
+          this.logger?.debug(`synced plugin ${name}`);
+        } else if (plugin.syncState && r.status === "rejected") {
+          this.logger?.error(r.reason, `failed to sync plugin ${name}`);
+        }
+      });
+      delta = Math.floor(Date.now() / 1e3) - Number(timestamp);
+      this.logger?.debug(
+        `synced state to block ${blockNumber} (delta ${delta}s)`
+      );
+    } catch (e) {
+      this.logger?.error(
+        `sync state to block ${blockNumber} with ts ${timestamp} failed, reverting to old block ${prevBlock} with ts ${prevTimestamp}: ${e}`
+      );
+      this.#currentBlock = prevBlock;
+      this.#timestamp = prevTimestamp;
+    } finally {
+      this.#syncing = false;
+    }
   }
   get provider() {
     return this.#provider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "9.9.0",
+  "version": "9.9.1",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",