@gearbox-protocol/sdk 8.24.2 → 8.24.3

package/dist/cjs/plugins/zappers/ZappersPlugin.js

@@ -28,7 +28,7 @@ class ZappersPlugin extends import_sdk.BasePlugin {
   #extraZappers;
   constructor(extraZappers = [], loadOnAttach = false) {
     super(loadOnAttach);
-    this.#extraZappers = extraZappers;
+    this.#extraZappers = this.#addExtraZappers(extraZappers);
   }
   async load(force) {
     if (!force && this.loaded) {
@@ -65,17 +65,19 @@ class ZappersPlugin extends import_sdk.BasePlugin {
         );
       } else {
         this.sdk.logger?.error(
-          `failed to load zapper for market configurator ${this.labelAddress(marketConfigurator)} and pool ${this.labelAddress(pool)}: ${error}`
+          `failed to load zapper for market configurator ${this.labelAddress(
+            marketConfigurator
+          )} and pool ${this.labelAddress(pool)}: ${error}`
         );
       }
     }
-    this.#addExtraZappers();
     this.#loadZapperTokens();
     return this.state;
   }
-  #addExtraZappers() {
-    for (const z of this.#extraZappers) {
-      const existing = this.#zappers?.get(z.pool);
+  #addExtraZappers(extraZappers) {
+    const zappers = new import_sdk.AddressMap();
+    for (const z of extraZappers) {
+      const existing = zappers?.get(z.pool);
       if (existing) {
         const hasZapper = existing.some(
           (zz) => (0, import_sdk.hexEq)(zz.baseParams.addr, z.baseParams.addr)
@@ -84,9 +86,16 @@ class ZappersPlugin extends import_sdk.BasePlugin {
           existing.push(z);
         }
       } else {
-        this.#zappers?.upsert(z.pool, [z]);
+        zappers?.upsert(z.pool, [z]);
       }
     }
+    return zappers;
+  }
+  get extraZappers() {
+    if (!this.#extraZappers) {
+      throw new Error("zappers plugin not attached");
+    }
+    return this.#extraZappers;
   }
   get zappers() {
     if (!this.#zappers) {
@@ -119,7 +128,8 @@ class ZappersPlugin extends import_sdk.BasePlugin {
   }
   #loadZapperTokens() {
     const zappersTokens = this.zappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
-    for (const t of zappersTokens) {
+    const extraZappersTokens = this.extraZappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
+    for (const t of [...zappersTokens, ...extraZappersTokens]) {
       this.sdk.tokensMeta.upsert(t.addr, t);
       this.sdk.provider.addressLabels.set(t.addr, t.symbol);
     }

package/dist/cjs/sdk/core/BotListV3Contract.js

@@ -57,7 +57,9 @@ class BotListContract extends import_base.BaseContract {
       fromBlock: this.#currentBlock,
       toBlock
     });
-    logs.forEach((e) => this.processLog(e));
+    logs.forEach((e) => {
+      this.processLog(e);
+    });
     this.#currentBlock = toBlock;
   }
   processLog(log) {

package/dist/esm/plugins/zappers/ZappersPlugin.js

@@ -11,7 +11,7 @@ class ZappersPlugin extends BasePlugin {
   #extraZappers;
   constructor(extraZappers = [], loadOnAttach = false) {
     super(loadOnAttach);
-    this.#extraZappers = extraZappers;
+    this.#extraZappers = this.#addExtraZappers(extraZappers);
   }
   async load(force) {
     if (!force && this.loaded) {
@@ -48,17 +48,19 @@ class ZappersPlugin extends BasePlugin {
         );
       } else {
         this.sdk.logger?.error(
-          `failed to load zapper for market configurator ${this.labelAddress(marketConfigurator)} and pool ${this.labelAddress(pool)}: ${error}`
+          `failed to load zapper for market configurator ${this.labelAddress(
+            marketConfigurator
+          )} and pool ${this.labelAddress(pool)}: ${error}`
         );
       }
     }
-    this.#addExtraZappers();
     this.#loadZapperTokens();
     return this.state;
   }
-  #addExtraZappers() {
-    for (const z of this.#extraZappers) {
-      const existing = this.#zappers?.get(z.pool);
+  #addExtraZappers(extraZappers) {
+    const zappers = new AddressMap();
+    for (const z of extraZappers) {
+      const existing = zappers?.get(z.pool);
       if (existing) {
         const hasZapper = existing.some(
           (zz) => hexEq(zz.baseParams.addr, z.baseParams.addr)
@@ -67,9 +69,16 @@ class ZappersPlugin extends BasePlugin {
           existing.push(z);
         }
       } else {
-        this.#zappers?.upsert(z.pool, [z]);
+        zappers?.upsert(z.pool, [z]);
       }
     }
+    return zappers;
+  }
+  get extraZappers() {
+    if (!this.#extraZappers) {
+      throw new Error("zappers plugin not attached");
+    }
+    return this.#extraZappers;
   }
   get zappers() {
     if (!this.#zappers) {
@@ -102,7 +111,8 @@ class ZappersPlugin extends BasePlugin {
   }
   #loadZapperTokens() {
     const zappersTokens = this.zappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
-    for (const t of zappersTokens) {
+    const extraZappersTokens = this.extraZappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
+    for (const t of [...zappersTokens, ...extraZappersTokens]) {
       this.sdk.tokensMeta.upsert(t.addr, t);
       this.sdk.provider.addressLabels.set(t.addr, t.symbol);
     }

package/dist/esm/sdk/core/BotListV3Contract.js

@@ -34,7 +34,9 @@ class BotListContract extends BaseContract {
       fromBlock: this.#currentBlock,
       toBlock
     });
-    logs.forEach((e) => this.processLog(e));
+    logs.forEach((e) => {
+      this.processLog(e);
+    });
     this.#currentBlock = toBlock;
   }
   processLog(log) {

package/dist/types/plugins/zappers/ZappersPlugin.d.ts

@@ -9,6 +9,7 @@ export declare class ZappersPlugin extends BasePlugin<ZappersPluginState> implem
     #private;
     constructor(extraZappers?: ZapperDataFull[], loadOnAttach?: boolean);
     load(force?: boolean): Promise<ZappersPluginState>;
+    get extraZappers(): AddressMap<ZapperDataFull[]>;
     get zappers(): AddressMap<ZapperDataFull[]>;
     get loaded(): boolean;
     stateHuman(_?: boolean): ZapperStateHuman[];

package/package.json

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