Merge branch 'starknet-io:develop' into issue-starknet-io#1014

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [6.14.1](https://github.com/starknet-io/starknet.js/compare/v6.14.0...v6.14.1) (2024-09-30)
+
+### Bug Fixes
+
+- adjust module configuration ([47e52cf](https://github.com/starknet-io/starknet.js/commit/47e52cf39a71bf99188edc4991b002018e296504))
+
 # [6.14.0](https://github.com/starknet-io/starknet.js/compare/v6.13.1...v6.14.0) (2024-09-04)
 
 ### Features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "6.14.0",
+  "version": "6.14.1",
   "description": "JavaScript library for Starknet",
   "license": "MIT",
   "repository": {

src/channel/rpc_0_6.ts

@@ -51,13 +51,24 @@ export class RpcChannel {
 
   private specVersion?: string;
 
+  private transactionRetryIntervalFallback?: number;
+
   readonly waitMode: Boolean; // behave like web2 rpc and return when tx is processed
 
   private batchClient?: BatchClient;
 
   constructor(optionsOrProvider?: RpcProviderOptions) {
-    const { nodeUrl, retries, headers, blockIdentifier, chainId, specVersion, waitMode, batch } =
-      optionsOrProvider || {};
+    const {
+      nodeUrl,
+      retries,
+      headers,
+      blockIdentifier,
+      chainId,
+      specVersion,
+      waitMode,
+      transactionRetryIntervalFallback,
+      batch,
+    } = optionsOrProvider || {};
     if (Object.values(NetworkName).includes(nodeUrl as NetworkName)) {
       this.nodeUrl = getDefaultNodeUrl(nodeUrl as NetworkName, optionsOrProvider?.default);
     } else if (nodeUrl) {
@@ -72,6 +83,7 @@ export class RpcChannel {
     this.specVersion = specVersion;
     this.waitMode = waitMode || false;
     this.requestId = 0;
+    this.transactionRetryIntervalFallback = transactionRetryIntervalFallback;
 
     if (typeof batch === 'number') {
       this.batchClient = new BatchClient({
@@ -82,6 +94,10 @@ export class RpcChannel {
     }
   }
 
+  private get transactionRetryIntervalDefault() {
+    return this.transactionRetryIntervalFallback ?? 5000;
+  }
+
   public setChainId(chainId: StarknetChainId) {
     this.chainId = chainId;
   }
@@ -267,7 +283,7 @@ export class RpcChannel {
     let { retries } = this;
     let onchain = false;
     let isErrorState = false;
-    const retryInterval = options?.retryInterval ?? 5000;
+    const retryInterval = options?.retryInterval ?? this.transactionRetryIntervalDefault;
     const errorStates: any = options?.errorStates ?? [
       RPC.ETransactionStatus.REJECTED,
       // TODO: commented out to preserve the long-standing behavior of "reverted" not being treated as an error by default

src/signer/ledgerSigner.ts

@@ -40,7 +40,7 @@ type _Transport = any;
 /**
  * Signer for accounts using a Ledger Nano S+/X signature
  */
-export class LedgerSigner<Transport extends Record<any, any>> implements SignerInterface {
+export class LedgerSigner<Transport extends Record<any, any> = any> implements SignerInterface {
   readonly transporter: Transport;
 
   // this is a hack to allow the '@ledgerhq/hw-transport' type to be used as a dev dependency but not exposed in the production build