@gearbox-protocol/sdk 9.12.0 → 9.12.2

package/dist/cjs/dev/RevolverTransport.js

@@ -23,10 +23,11 @@ __export(RevolverTransport_exports, {
 });
 module.exports = __toCommonJS(RevolverTransport_exports);
 var import_viem = require("viem");
+var import_rpc = require("../../node_modules/viem/errors/rpc");
 var import_providers = require("./providers.js");
 class NoAvailableTransportsError extends import_viem.BaseError {
-  constructor() {
-    super("no available transports");
+  constructor(cause) {
+    super("no available transports", { cause });
   }
 }
 class RevolverTransport {
@@ -54,7 +55,10 @@ class RevolverTransport {
     };
   }
   constructor(config) {
-    this.#config = { ...config };
+    this.#config = {
+      ...config,
+      shouldRetry: config.shouldRetry ?? defaultShouldRetry
+    };
     const rpcUrls = /* @__PURE__ */ new Map();
     const cooldowns = /* @__PURE__ */ new Map();
     for (const { provider, keys, cooldown } of config.providers) {
@@ -99,13 +103,22 @@ class RevolverTransport {
     if (this.#transports.length === 1) {
       return this.#transport({ ...this.overrides }).request(r);
     }
+    let error;
     do {
       try {
         this.#requests.set(r, this.currentTransportName());
-        const resp = await this.#transport({ ...this.overrides }).request(r);
+        const resp = await (0, import_viem.withRetry)(
+          () => this.#transport({ ...this.overrides }).request(r),
+          {
+            delay: this.#config.retryDelay,
+            retryCount: this.#config.retryCount,
+            shouldRetry: this.#config.shouldRetry
+          }
+        );
         this.#requests.delete(r);
         return resp;
       } catch (e) {
+        error = error ?? e;
         if (e instanceof import_viem.RpcError || e instanceof import_viem.HttpRequestError) {
           const reqTransport = this.#requests.get(r);
           if (reqTransport === this.currentTransportName()) {
@@ -122,7 +135,7 @@ class RevolverTransport {
       }
     } while (this.#hasAvailableTransports);
     this.#requests.delete(r);
-    throw new NoAvailableTransportsError();
+    throw new NoAvailableTransportsError(error);
   };
   get config() {
     return {
@@ -154,7 +167,6 @@ class RevolverTransport {
       {
         reason,
         current: this.currentTransportName,
-        index: this.#index,
         total: this.#transports.length
       },
       "rotating transport"
@@ -168,7 +180,6 @@ class RevolverTransport {
         this.#logger?.info(
           {
             current: this.currentTransportName,
-            index: this.#index,
             total: this.#transports.length
           },
           "switched to next transport"
@@ -187,7 +198,6 @@ class RevolverTransport {
         this.#logger?.warn(
           {
             current: this.currentTransportName,
-            index: this.#index,
             total: this.#transports.length
           },
           "transport is still on cooldown"
@@ -222,6 +232,21 @@ class RevolverTransport {
     return this.#transports.some((t) => t.cooldown < now);
   }
 }
+const retryCodes = /* @__PURE__ */ new Set([
+  import_viem.InvalidRequestRpcError.code,
+  import_viem.InvalidParamsRpcError.code,
+  import_viem.InvalidInputRpcError.code,
+  import_rpc.ResourceNotFoundRpcError.code,
+  import_viem.ResourceUnavailableRpcError.code
+]);
+const defaultShouldRetry = ({
+  error
+}) => {
+  if ("code" in error && typeof error.code === "number") {
+    return retryCodes.has(error.code);
+  }
+  return false;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   NoAvailableTransportsError,

package/dist/cjs/sdk/sdk-legacy/core/transactions.js

@@ -521,7 +521,7 @@ class TxApprove extends import_eventOrTx.EVMTx {
   }
   _toString() {
     const { title: symbol } = this.token;
-    return `Approve ${symbol}`;
+    return `Approved ${symbol}`;
   }
   serialize() {
     return {

package/dist/esm/dev/RevolverTransport.js

@@ -2,14 +2,20 @@ import {
   BaseError,
   HttpRequestError,
   http,
-  RpcError
+  InvalidInputRpcError,
+  InvalidParamsRpcError,
+  InvalidRequestRpcError,
+  ResourceUnavailableRpcError,
+  RpcError,
+  withRetry
 } from "viem";
+import { ResourceNotFoundRpcError } from "../../node_modules/viem/errors/rpc";
 import {
   getProviderUrl
 } from "./providers.js";
 class NoAvailableTransportsError extends BaseError {
-  constructor() {
-    super("no available transports");
+  constructor(cause) {
+    super("no available transports", { cause });
   }
 }
 class RevolverTransport {
@@ -37,7 +43,10 @@ class RevolverTransport {
     };
   }
   constructor(config) {
-    this.#config = { ...config };
+    this.#config = {
+      ...config,
+      shouldRetry: config.shouldRetry ?? defaultShouldRetry
+    };
     const rpcUrls = /* @__PURE__ */ new Map();
     const cooldowns = /* @__PURE__ */ new Map();
     for (const { provider, keys, cooldown } of config.providers) {
@@ -82,13 +91,22 @@ class RevolverTransport {
     if (this.#transports.length === 1) {
       return this.#transport({ ...this.overrides }).request(r);
     }
+    let error;
     do {
       try {
         this.#requests.set(r, this.currentTransportName());
-        const resp = await this.#transport({ ...this.overrides }).request(r);
+        const resp = await withRetry(
+          () => this.#transport({ ...this.overrides }).request(r),
+          {
+            delay: this.#config.retryDelay,
+            retryCount: this.#config.retryCount,
+            shouldRetry: this.#config.shouldRetry
+          }
+        );
         this.#requests.delete(r);
         return resp;
       } catch (e) {
+        error = error ?? e;
         if (e instanceof RpcError || e instanceof HttpRequestError) {
           const reqTransport = this.#requests.get(r);
           if (reqTransport === this.currentTransportName()) {
@@ -105,7 +123,7 @@ class RevolverTransport {
       }
     } while (this.#hasAvailableTransports);
     this.#requests.delete(r);
-    throw new NoAvailableTransportsError();
+    throw new NoAvailableTransportsError(error);
   };
   get config() {
     return {
@@ -137,7 +155,6 @@ class RevolverTransport {
       {
         reason,
         current: this.currentTransportName,
-        index: this.#index,
         total: this.#transports.length
       },
       "rotating transport"
@@ -151,7 +168,6 @@ class RevolverTransport {
         this.#logger?.info(
           {
             current: this.currentTransportName,
-            index: this.#index,
             total: this.#transports.length
           },
           "switched to next transport"
@@ -170,7 +186,6 @@ class RevolverTransport {
         this.#logger?.warn(
           {
             current: this.currentTransportName,
-            index: this.#index,
             total: this.#transports.length
           },
           "transport is still on cooldown"
@@ -205,6 +220,21 @@ class RevolverTransport {
     return this.#transports.some((t) => t.cooldown < now);
   }
 }
+const retryCodes = /* @__PURE__ */ new Set([
+  InvalidRequestRpcError.code,
+  InvalidParamsRpcError.code,
+  InvalidInputRpcError.code,
+  ResourceNotFoundRpcError.code,
+  ResourceUnavailableRpcError.code
+]);
+const defaultShouldRetry = ({
+  error
+}) => {
+  if ("code" in error && typeof error.code === "number") {
+    return retryCodes.has(error.code);
+  }
+  return false;
+};
 export {
   NoAvailableTransportsError,
   RevolverTransport

package/dist/esm/sdk/sdk-legacy/core/transactions.js

@@ -471,7 +471,7 @@ class TxApprove extends EVMTx {
   }
   _toString() {
     const { title: symbol } = this.token;
-    return `Approve ${symbol}`;
+    return `Approved ${symbol}`;
   }
   serialize() {
     return {

package/dist/types/dev/RevolverTransport.d.ts

@@ -18,6 +18,19 @@ export interface RevolverTransportConfig {
     retryCount?: TransportConfig["retryCount"] | undefined;
     retryDelay?: TransportConfig["retryDelay"] | undefined;
     timeout?: TransportConfig["timeout"] | undefined;
+    /**
+     * When single http transport should retry?
+     * Defaults to some less strict criteria, so it'll retry "blockNumber from the future" errors
+     *
+     * By viem's default, simple http transport retries LimitExceededRpcError.code, InternalRpcError.code and HTTP errors
+     * so for things like ResourceNotFoundRpcError (eth_call with block number from other rps, which is yet in the future for current rpc)
+     * it'll fail and not retry
+     * https://github.com/wevm/viem/blob/3bc5e6f3c4a317441063342dd9ec2aaa7eb56b01/src/utils/buildRequest.ts#L269
+     */
+    shouldRetry?: ((iter: {
+        count: number;
+        error: Error;
+    }) => Promise<boolean> | boolean) | undefined;
     /**
      * Allow batching of json-rpc requests
      */
@@ -44,7 +57,7 @@ export interface RevolverTransportConfig {
     cooldown?: number | undefined;
 }
 export declare class NoAvailableTransportsError extends BaseError {
-    constructor();
+    constructor(cause?: Error);
 }
 export interface RevolverTransportValue {
     /**

package/package.json

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