gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: make confirm transaction timeout configurable (#19954)

Browse Source
This commit is contained in:
Josh
2021-09-17 09:54:25 -07:00
committed by GitHub
parent 9998e16df3
commit 0404e75e96
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web3.js/src/connection.ts
View File

@ -1979,6 +1979,8 @@ export type ConnectionConfig = {
fetchMiddleware?: FetchMiddleware; fetchMiddleware?: FetchMiddleware;
/** Optional Disable retring calls when server responds with HTTP 429 (Too Many Requests) */ /** Optional Disable retring calls when server responds with HTTP 429 (Too Many Requests) */
disableRetryOnRateLimit?: boolean; disableRetryOnRateLimit?: boolean;
/** time to allow for the server to initially process a transaction (in milliseconds) */
confirmTransactionInitialTimeout?: number;
}; };
/** /**
@ -1986,6 +1988,7 @@ export type ConnectionConfig = {
*/ */
export class Connection { export class Connection {
/** @internal */ _commitment?: Commitment; /** @internal */ _commitment?: Commitment;
/** @internal */ _confirmTransactionInitialTimeout?: number;
/** @internal */ _rpcEndpoint: string; /** @internal */ _rpcEndpoint: string;
/** @internal */ _rpcWsEndpoint: string; /** @internal */ _rpcWsEndpoint: string;
/** @internal */ _rpcClient: RpcClient; /** @internal */ _rpcClient: RpcClient;
@ -2070,6 +2073,8 @@ export class Connection {
this._commitment = commitmentOrConfig; this._commitment = commitmentOrConfig;
} else if (commitmentOrConfig) { } else if (commitmentOrConfig) {
this._commitment = commitmentOrConfig.commitment; this._commitment = commitmentOrConfig.commitment;
this._confirmTransactionInitialTimeout =
commitmentOrConfig.confirmTransactionInitialTimeout;
wsEndpoint = commitmentOrConfig.wsEndpoint; wsEndpoint = commitmentOrConfig.wsEndpoint;
httpHeaders = commitmentOrConfig.httpHeaders; httpHeaders = commitmentOrConfig.httpHeaders;
fetchMiddleware = commitmentOrConfig.fetchMiddleware; fetchMiddleware = commitmentOrConfig.fetchMiddleware;
@ -2629,14 +2634,14 @@ export class Connection {
} }
}); });
let timeoutMs = 60 * 1000; let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
switch (subscriptionCommitment) { switch (subscriptionCommitment) {
case 'processed': case 'processed':
case 'recent': case 'recent':
case 'single': case 'single':
case 'confirmed': case 'confirmed':
case 'singleGossip': { case 'singleGossip': {
timeoutMs = 30 * 1000; timeoutMs = this._confirmTransactionInitialTimeout || 30 * 1000;
break; break;
} }
// exhaust enums to ensure full coverage // exhaust enums to ensure full coverage