@atomiqlabs/chain-starknet 4.0.0-dev.13 → 4.0.0-dev.14

package/dist/starknet/provider/RpcProviderWithRetries.d.ts

@@ -1,5 +1,18 @@
-import { RpcChannel, RpcProvider, RpcProviderOptions } from "starknet";
-export declare class RpcChannelWithRetries extends RpcChannel {
+import { RPC08, RPC09, RpcProvider, RpcProviderOptions } from "starknet";
+export declare class Rpc08ChannelWithRetries extends RPC08.RpcChannel {
+    readonly retryPolicy?: {
+        maxRetries?: number;
+        delay?: number;
+        exponential?: boolean;
+    };
+    constructor(options?: RpcProviderOptions, retryPolicy?: {
+        maxRetries?: number;
+        delay?: number;
+        exponential?: boolean;
+    });
+    protected fetchEndpoint(method: any, params?: any): Promise<any>;
+}
+export declare class Rpc09ChannelWithRetries extends RPC09.RpcChannel {
     readonly retryPolicy?: {
         maxRetries?: number;
         delay?: number;

package/dist/starknet/provider/RpcProviderWithRetries.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcProviderWithRetries = exports.RpcChannelWithRetries = void 0;
+exports.RpcProviderWithRetries = exports.Rpc09ChannelWithRetries = exports.Rpc08ChannelWithRetries = void 0;
 const starknet_1 = require("starknet");
 const Utils_1 = require("../../utils/Utils");
-class RpcChannelWithRetries extends starknet_1.RpcChannel {
+class Rpc08ChannelWithRetries extends starknet_1.RPC08.RpcChannel {
     constructor(options, retryPolicy) {
         super(options);
         this.retryPolicy = retryPolicy;
@@ -22,11 +22,38 @@ class RpcChannelWithRetries extends starknet_1.RpcChannel {
         });
     }
 }
-exports.RpcChannelWithRetries = RpcChannelWithRetries;
+exports.Rpc08ChannelWithRetries = Rpc08ChannelWithRetries;
+class Rpc09ChannelWithRetries extends starknet_1.RPC09.RpcChannel {
+    constructor(options, retryPolicy) {
+        super(options);
+        this.retryPolicy = retryPolicy;
+    }
+    fetchEndpoint(method, params) {
+        return (0, Utils_1.tryWithRetries)(() => super.fetchEndpoint(method, params), this.retryPolicy, e => {
+            if (!e.message.startsWith("RPC: "))
+                return false;
+            const arr = e.message.split("\n");
+            const errorCode = parseInt(arr[arr.length - 1]);
+            if (isNaN(errorCode))
+                return false;
+            if (errorCode < 0)
+                return false; //Not defined error, e.g. Rate limit (-32097)
+            return true;
+        });
+    }
+}
+exports.Rpc09ChannelWithRetries = Rpc09ChannelWithRetries;
 class RpcProviderWithRetries extends starknet_1.RpcProvider {
     constructor(options, retryPolicy) {
+        if (options.specVersion == null)
+            options.specVersion = options.nodeUrl.endsWith("v0_8") ? "0.8.1" : "0.9.0";
         super(options);
-        this.channel = new RpcChannelWithRetries({ ...options, waitMode: false }, retryPolicy);
+        if (this.channel.id === "RPC081") {
+            this.channel = new Rpc08ChannelWithRetries({ ...options, waitMode: false }, retryPolicy);
+        }
+        else if (this.channel.id === "RPC090") {
+            this.channel = new Rpc09ChannelWithRetries({ ...options, waitMode: false }, retryPolicy);
+        }
     }
 }
 exports.RpcProviderWithRetries = RpcProviderWithRetries;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "4.0.0-dev.13",
+  "version": "4.0.0-dev.14",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/starknet/provider/RpcProviderWithRetries.ts

@@ -1,11 +1,37 @@
 import {
-    RpcChannel,
+    RPC08, RPC09,
     RpcProvider,
     RpcProviderOptions
 } from "starknet";
 import {tryWithRetries} from "../../utils/Utils";
 
-export class RpcChannelWithRetries extends RpcChannel {
+export class Rpc08ChannelWithRetries extends RPC08.RpcChannel {
+
+    readonly retryPolicy?: {
+        maxRetries?: number, delay?: number, exponential?: boolean
+    };
+
+    constructor(options?: RpcProviderOptions, retryPolicy?: {
+        maxRetries?: number, delay?: number, exponential?: boolean
+    }) {
+        super(options);
+        this.retryPolicy = retryPolicy;
+    }
+
+    protected fetchEndpoint(method: any, params?: any): Promise<any> {
+        return tryWithRetries(() => super.fetchEndpoint(method, params), this.retryPolicy, e => {
+            if(!e.message.startsWith("RPC: ")) return false;
+            const arr = e.message.split("\n");
+            const errorCode = parseInt(arr[arr.length-1]);
+            if(isNaN(errorCode)) return false;
+            if(errorCode < 0) return false; //Not defined error, e.g. Rate limit (-32097)
+            return true;
+        });
+    }
+
+}
+
+export class Rpc09ChannelWithRetries extends RPC09.RpcChannel {
 
     readonly retryPolicy?: {
         maxRetries?: number, delay?: number, exponential?: boolean
@@ -36,8 +62,13 @@ export class RpcProviderWithRetries extends RpcProvider {
     constructor(options?: RpcProviderOptions, retryPolicy?: {
         maxRetries?: number, delay?: number, exponential?: boolean
     }) {
+        if(options.specVersion==null) options.specVersion = options.nodeUrl.endsWith("v0_8") ? "0.8.1" : "0.9.0";
         super(options);
-        this.channel = new RpcChannelWithRetries({ ...options, waitMode: false }, retryPolicy);
+        if(this.channel.id==="RPC081") {
+            this.channel = new Rpc08ChannelWithRetries({ ...options, waitMode: false }, retryPolicy);
+        } else if(this.channel.id==="RPC090") {
+            this.channel = new Rpc09ChannelWithRetries({ ...options, waitMode: false }, retryPolicy);
+        }
     }
 
 }