@injectivelabs/sdk-ts 1.19.19 → 1.19.21

package/dist/esm/{tx-C7Y3PBAX.js → tx-C_nLhljB.js}

@@ -6,7 +6,7 @@ import { t as BaseGrpcConsumer } from "./BaseGrpcConsumer-WvNC6PWw.js";
 import { t as IndexerGrpcWeb3GwApi } from "./IndexerGrpcWeb3GwApi-Bc5TEiq5.js";
 import * as CosmosTxV1Beta1TxPb from "@injectivelabs/core-proto-ts-v2/generated/cosmos/tx/v1beta1/tx_pb";
 import { keccak256 } from "viem";
-import { DEFAULT_BLOCK_TIMEOUT_HEIGHT, DEFAULT_BLOCK_TIME_IN_SECONDS, DEFAULT_TX_BLOCK_INCLUSION_TIMEOUT_IN_MS, HttpClient, getDefaultStdFee, getStdFee, getStdFeeFromString, sleep, toBigNumber } from "@injectivelabs/utils";
+import { DEFAULT_BLOCK_TIMEOUT_HEIGHT, DEFAULT_BLOCK_TIME_IN_SECONDS, DEFAULT_TX_BLOCK_INCLUSION_TIMEOUT_IN_MS, DEFAULT_TX_POLL_CALL_TIMEOUT_MS, DEFAULT_TX_POLL_INTERVAL_MS, HttpClient, getDefaultStdFee, getStdFee, getStdFeeFromString, sleep, toBigNumber } from "@injectivelabs/utils";
 import { GeneralException, GrpcUnaryRequestException, HttpRequestException, HttpRequestMethod, TransactionException, UnspecifiedErrorCode } from "@injectivelabs/exceptions";
 import { Network, getNetworkEndpoints, getNetworkInfo } from "@injectivelabs/networks";
 import { StatusCodes } from "http-status-codes";
@@ -297,48 +297,36 @@ var TxGrpcApi = class extends BaseGrpcConsumer {
 		}
 	}
 	async fetchTxPoll(txHash, timeout = DEFAULT_TX_BLOCK_INCLUSION_TIMEOUT_IN_MS) {
-		const STAGGER = 300;
-		const POLL_INTERVAL = 500;
-		const CALL_TIMEOUT = 3e3;
 		const deadline = Date.now() + timeout;
-		while (Date.now() < deadline) {
-			const start = Date.now();
-			const result = await Promise.race([this.fetchTxDual(txHash, STAGGER), sleep(CALL_TIMEOUT).then(() => null)]);
-			if (result) return result;
-			const remaining = POLL_INTERVAL - (Date.now() - start);
-			if (remaining > 0) await sleep(remaining);
+		for (let start = Date.now(); start < deadline; start = Date.now()) {
+			try {
+				const tx = await this.fetchTxDual(txHash, deadline);
+				if (tx) return tx;
+			} catch (e) {
+				if (e instanceof TransactionException) throw e;
+			}
+			const gap = DEFAULT_TX_POLL_INTERVAL_MS - (Date.now() - start);
+			if (gap > 0) await sleep(gap);
 		}
 		throw new GrpcUnaryRequestException(/* @__PURE__ */ new Error(`Transaction was not included in a block before timeout of ${timeout}ms`), {
 			context: "TxGrpcApi",
 			contextModule: "fetch-tx-poll"
 		});
 	}
-	fetchTxDual(txHash, stagger) {
-		return new Promise((resolve, reject) => {
-			let pending = 2;
-			let timerId;
-			const onResult = (response) => {
-				if (response) {
-					clearTimeout(timerId);
-					return resolve(response);
-				}
-				pending -= 1;
-				if (pending === 0) resolve(null);
-			};
-			const onError = (e) => {
-				if (e instanceof TransactionException) {
-					clearTimeout(timerId);
-					return reject(e);
-				}
-				pending -= 1;
-				if (pending === 0) resolve(null);
-			};
-			this.fetchTx(txHash).then(onResult, onError);
-			timerId = setTimeout(() => {
-				this.fetchTx(txHash).then(onResult, onError);
-			}, stagger);
+	async safeFetchTx(txHash, delay) {
+		if (delay) await sleep(delay);
+		return this.fetchTx(txHash).catch((e) => {
+			if (e instanceof TransactionException) throw e;
+			return null;
 		});
 	}
+	fetchTxDual(txHash, deadline) {
+		const STAGGER = 300;
+		const timeout = Math.max(0, Math.min(DEFAULT_TX_POLL_CALL_TIMEOUT_MS, deadline - Date.now()));
+		const fetches = Promise.all([this.safeFetchTx(txHash), this.safeFetchTx(txHash, STAGGER)]).then(([a, b]) => a !== null && a !== void 0 ? a : b);
+		fetches.catch(() => {});
+		return Promise.race([fetches, sleep(timeout).then(() => null)]);
+	}
 	async simulate(txRaw) {
 		const txRawClone = CosmosTxV1Beta1TxPb.TxRaw.create({ ...txRaw });
 		const simulateRequest = CosmosTxV1Beta1ServicePb.SimulateRequest.create();
@@ -473,17 +461,16 @@ var TxRestApi = class {
 		}
 	}
 	async fetchTxPoll(txHash, timeout = DEFAULT_TX_BLOCK_INCLUSION_TIMEOUT_IN_MS) {
-		const POLL_INTERVAL = 500;
 		const deadline = Date.now() + timeout;
-		while (Date.now() < deadline) {
-			const start = Date.now();
+		for (let start = Date.now(); start < deadline; start = Date.now()) {
+			const callTimeout = Math.max(0, Math.min(DEFAULT_TX_POLL_CALL_TIMEOUT_MS, deadline - Date.now()));
 			try {
-				const txResponse = await this.fetchTx(txHash);
+				const txResponse = await Promise.race([this.fetchTx(txHash), sleep(callTimeout).then(() => null)]);
 				if (txResponse) return txResponse;
 			} catch (e) {
 				if (e instanceof TransactionException) throw e;
 			}
-			const remaining = POLL_INTERVAL - (Date.now() - start);
+			const remaining = DEFAULT_TX_POLL_INTERVAL_MS - (Date.now() - start);
 			if (remaining > 0) await sleep(remaining);
 		}
 		throw new HttpRequestException(/* @__PURE__ */ new Error(`Transaction was not included in a block before timeout of ${timeout}ms`), {

package/dist/esm/utils.d.ts

@@ -1,6 +1,6 @@
 import "./tx_pb-DG9OU_HE.js";
 import "./index-DJtcTm1W.js";
-import { $d as derivativeMarginToChainMarginToFixed, $f as privateKeyToPublicKey, $u as fetchAllWithPagination, Ad as getChecksumAddress, Af as getErrorMessage, Bd as getSpotMarketDecimals, Bf as safeBigIntStringify, Cd as toBase64, Cf as spotQuantityFromChainQuantity, Dd as uint8ArrayToString, Df as bigIntReplacer, Ed as uint8ArrayToHex, Ef as spotQuantityToChainQuantityToFixed, Fd as getSubaccountId, Ff as isNode, Gd as denomAmountFromChainDenomAmountToFixed, Gf as TypedDataUtilsSanitizeData, Hd as amountToCosmosSdkDecAmount, Hf as sortObjectByKeysWithReduce, Id as isCw20ContractAddress, If as isReactNative, Jd as denomAmountToChainDenomAmountToFixed, Jf as domainHash, Kd as denomAmountFromGrpcChainDenomAmount, Kf as TypedMessageV4, Ld as removeHexPrefix, Lf as isServerSide, Md as getEthereumAddress, Mf as hexToNumber, Nd as getInjectiveAddress, Nf as isBrowser, Od as addHexPrefix, Of as bigIntToNumber, Pd as getInjectiveAddressFromSubaccountId, Pf as isJsonString, Qd as derivativeMarginToChainMargin, Qf as privateKeyHashToPublicKeyBase64, Qu as recoverTypedSignaturePubKey, Rd as getDerivativeMarketDecimals, Rf as objectToJson, Sd as stringToUint8Array, Sf as spotPriceToChainPriceToFixed, Td as uint8ArrayToBase64, Tf as spotQuantityToChainQuantity, Tx as GrpcWebFetchTransport, Ud as cosmosSdkDecToBigNumber, Uf as SignTypedDataVersionV4, Vd as getSpotMarketTensMultiplier, Vf as sortObjectByKeys, Wd as denomAmountFromChainDenomAmount, Wf as TypedDataUtilsHashStruct, Xd as derivativeMarginFromChainMargin, Xf as messageHash, Yd as denomAmountToGrpcChainDenomAmount, Yf as hashToHex, Zd as derivativeMarginFromChainMarginToFixed, Zf as privateKeyHashToPublicKey, _d as fromBase64, _f as isNumber, ad as paginationUint8ArrayToString, af as derivativeQuantityFromChainQuantityToFixed, ap as parseCoins, bd as hexToBuff, bf as spotPriceFromChainPriceToFixed, cd as BECH32_ADDR_VAL_PREFIX, cf as formatAmountToAllowableAmount, cp as getGasPriceBasedOnMessage, dd as BECH32_PUBKEY_VAL_PREFIX, df as formatNumberToAllowableTensMultiplier, dp as protobufTimestampToDate, ed as grpcPaginationToPagination, ef as derivativePriceFromChainPrice, ep as privateKeyToPublicKeyBase64, fd as DEFAULT_DERIVATION_PATH, ff as formatPriceToAllowableDecimals, fp as protobufTimestampToUnixMs, gd as concatUint8Arrays, gf as getTensMultiplier, hd as binaryToBase64, hf as getSignificantDecimalsFromNumber, id as paginationRequestFromPagination, if as derivativeQuantityFromChainQuantity, ip as sha256, jd as getDefaultSubaccountId, jf as grpcCoinToUiCoin, kd as getAddressFromInjectiveAddress, kf as bigIntToString, ld as BECH32_PUBKEY_ACC_PREFIX, lf as formatAmountToAllowableDecimals, lp as makeTimeoutTimestamp, md as base64ToUtf8, mf as getExactDecimalsFromNumber, nd as grpcPagingToPagingV2, nf as derivativePriceToChainPrice, np as ripemd160, od as BECH32_ADDR_ACC_PREFIX, of as derivativeQuantityToChainQuantity, op as ofacList, pd as base64ToUint8Array, pf as formatPriceToAllowablePrice, pp as protobufTimestampToUnixSeconds, qd as denomAmountToChainDenomAmount, qf as decompressPubKey, rd as pageRequestToGrpcPageRequestV2, rf as derivativePriceToChainPriceToFixed, rp as sanitizeTypedData, sd as BECH32_ADDR_CONS_PREFIX, sf as derivativeQuantityToChainQuantityToFixed, sp as getGrpcWebTransport, td as grpcPagingToPaging, tf as derivativePriceFromChainPriceToFixed, tp as publicKeyToAddress, ud as BECH32_PUBKEY_CONS_PREFIX, uf as formatNumberToAllowableDecimals, up as makeTimeoutTimestampInNs, vd as fromUtf8, vf as numberToCosmosSdkDecString, wd as toUtf8, wf as spotQuantityFromChainQuantityToFixed, xd as hexToUint8Array, xf as spotPriceToChainPrice, yd as hexToBase64, yf as spotPriceFromChainPrice, zd as getDerivativeMarketTensMultiplier, zf as protoObjectToJson } from "./index-Bq6CkYRk.js";
+import { $d as derivativeMarginToChainMarginToFixed, $f as privateKeyToPublicKey, $u as fetchAllWithPagination, Ad as getChecksumAddress, Af as getErrorMessage, Bd as getSpotMarketDecimals, Bf as safeBigIntStringify, Cd as toBase64, Cf as spotQuantityFromChainQuantity, Dd as uint8ArrayToString, Df as bigIntReplacer, Ed as uint8ArrayToHex, Ef as spotQuantityToChainQuantityToFixed, Fd as getSubaccountId, Ff as isNode, Gd as denomAmountFromChainDenomAmountToFixed, Gf as TypedDataUtilsSanitizeData, Hd as amountToCosmosSdkDecAmount, Hf as sortObjectByKeysWithReduce, Id as isCw20ContractAddress, If as isReactNative, Jd as denomAmountToChainDenomAmountToFixed, Jf as domainHash, Kd as denomAmountFromGrpcChainDenomAmount, Kf as TypedMessageV4, Ld as removeHexPrefix, Lf as isServerSide, Md as getEthereumAddress, Mf as hexToNumber, Nd as getInjectiveAddress, Nf as isBrowser, Od as addHexPrefix, Of as bigIntToNumber, Pd as getInjectiveAddressFromSubaccountId, Pf as isJsonString, Qd as derivativeMarginToChainMargin, Qf as privateKeyHashToPublicKeyBase64, Qu as recoverTypedSignaturePubKey, Rd as getDerivativeMarketDecimals, Rf as objectToJson, Sd as stringToUint8Array, Sf as spotPriceToChainPriceToFixed, Td as uint8ArrayToBase64, Tf as spotQuantityToChainQuantity, Tx as GrpcWebFetchTransport, Ud as cosmosSdkDecToBigNumber, Uf as SignTypedDataVersionV4, Vd as getSpotMarketTensMultiplier, Vf as sortObjectByKeys, Wd as denomAmountFromChainDenomAmount, Wf as TypedDataUtilsHashStruct, Xd as derivativeMarginFromChainMargin, Xf as messageHash, Yd as denomAmountToGrpcChainDenomAmount, Yf as hashToHex, Zd as derivativeMarginFromChainMarginToFixed, Zf as privateKeyHashToPublicKey, _d as fromBase64, _f as isNumber, ad as paginationUint8ArrayToString, af as derivativeQuantityFromChainQuantityToFixed, ap as parseCoins, bd as hexToBuff, bf as spotPriceFromChainPriceToFixed, cd as BECH32_ADDR_VAL_PREFIX, cf as formatAmountToAllowableAmount, cp as getGasPriceBasedOnMessage, dd as BECH32_PUBKEY_VAL_PREFIX, df as formatNumberToAllowableTensMultiplier, dp as protobufTimestampToDate, ed as grpcPaginationToPagination, ef as derivativePriceFromChainPrice, ep as privateKeyToPublicKeyBase64, fd as DEFAULT_DERIVATION_PATH, ff as formatPriceToAllowableDecimals, fp as protobufTimestampToUnixMs, gd as concatUint8Arrays, gf as getTensMultiplier, hd as binaryToBase64, hf as getSignificantDecimalsFromNumber, id as paginationRequestFromPagination, if as derivativeQuantityFromChainQuantity, ip as sha256, jd as getDefaultSubaccountId, jf as grpcCoinToUiCoin, kd as getAddressFromInjectiveAddress, kf as bigIntToString, ld as BECH32_PUBKEY_ACC_PREFIX, lf as formatAmountToAllowableDecimals, lp as makeTimeoutTimestamp, md as base64ToUtf8, mf as getExactDecimalsFromNumber, nd as grpcPagingToPagingV2, nf as derivativePriceToChainPrice, np as ripemd160, od as BECH32_ADDR_ACC_PREFIX, of as derivativeQuantityToChainQuantity, op as ofacList, pd as base64ToUint8Array, pf as formatPriceToAllowablePrice, pp as protobufTimestampToUnixSeconds, qd as denomAmountToChainDenomAmount, qf as decompressPubKey, rd as pageRequestToGrpcPageRequestV2, rf as derivativePriceToChainPriceToFixed, rp as sanitizeTypedData, sd as BECH32_ADDR_CONS_PREFIX, sf as derivativeQuantityToChainQuantityToFixed, sp as getGrpcWebTransport, td as grpcPagingToPaging, tf as derivativePriceFromChainPriceToFixed, tp as publicKeyToAddress, ud as BECH32_PUBKEY_CONS_PREFIX, uf as formatNumberToAllowableDecimals, up as makeTimeoutTimestampInNs, vd as fromUtf8, vf as numberToCosmosSdkDecString, wd as toUtf8, wf as spotQuantityFromChainQuantityToFixed, xd as hexToUint8Array, xf as spotPriceToChainPrice, yd as hexToBase64, yf as spotPriceFromChainPrice, zd as getDerivativeMarketTensMultiplier, zf as protoObjectToJson } from "./index-hr6Kp1tq.js";
 import "./BaseGrpcConsumer-BptQBj1l.js";
 import "./index-BSAdUyzU.js";
 import "./index-sT17wTBx.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/sdk-ts",
-  "version": "1.19.19",
+  "version": "1.19.21",
   "description": "SDK in TypeScript for building Injective applications in a browser, node, and react native environment.",
   "license": "Apache-2.0",
   "author": {
@@ -351,10 +351,10 @@
     "rxjs": "7.8.2",
     "snakecase-keys": "^5.4.1",
     "viem": "^2.41.2",
-    "@injectivelabs/exceptions": "1.19.19",
-    "@injectivelabs/ts-types": "1.19.19",
-    "@injectivelabs/networks": "1.19.19",
-    "@injectivelabs/utils": "1.19.19"
+    "@injectivelabs/exceptions": "1.19.21",
+    "@injectivelabs/networks": "1.19.21",
+    "@injectivelabs/ts-types": "1.19.21",
+    "@injectivelabs/utils": "1.19.21"
   },
   "publishConfig": {
     "access": "public"