@xchainjs/xchain-thorchain 0.27.2 → 0.27.5

package/lib/client.d.ts

@@ -33,7 +33,7 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
      *
      * @throws {"Invalid phrase"} Thrown if the given phase is invalid.
      */
-    constructor({ network, phrase, clientUrl, explorerUrls, rootDerivationPaths, chainIds, }: XChainClientParams & ThorchainClientParams);
+    constructor({ network, phrase, clientUrl, explorerUrls, rootDerivationPaths, chainIds, customRequestHeaders, }: XChainClientParams & ThorchainClientParams);
     /**
      * Set/update the current network.
      *
@@ -185,7 +185,7 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
      * @throws {"insufficient funds"} Thrown if the wallet has insufficient funds.
      * @throws {"Invalid transaction hash"} Thrown by missing tx hash
      */
-    deposit({ walletIndex, asset, amount, memo, gasLimit, }: DepositParam): Promise<TxHash>;
+    deposit({ walletIndex, asset, amount, memo, gasLimit, sequence, }: DepositParam): Promise<TxHash>;
     /**
      * Transfer balances with MsgSend
      *
@@ -195,8 +195,9 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
      * @throws {"insufficient funds"} Thrown if the wallet has insufficient funds.
      * @throws {"Invalid transaction hash"} Thrown by missing tx hash
      */
-    transfer({ walletIndex, asset, amount, recipient, memo, gasLimit, }: TxParams & {
+    transfer({ walletIndex, asset, amount, recipient, memo, gasLimit, sequence, }: TxParams & {
         gasLimit?: BigNumber;
+        sequence?: number;
     }): Promise<TxHash>;
     /**
      * Transfer without broadcast balances with MsgSend

package/lib/index.esm.js

@@ -9934,7 +9934,16 @@ const getExplorerTxUrl = ({ urls, network, txID, }) => {
         case Network.Testnet:
             return `${url}?network=testnet`;
     }
-};
+};
+const getAccount = (address, client) => {
+    const accAddress = cosmosclient.AccAddress.fromString(address);
+    return client.getAccount(accAddress);
+};
+const getSequence = (address, client) => __awaiter(void 0, void 0, void 0, function* () {
+    var _e;
+    const { sequence } = yield getAccount(address, client);
+    return (_e = sequence === null || sequence === void 0 ? void 0 : sequence.toNumber()) !== null && _e !== void 0 ? _e : null;
+});
 
 /**
  * Custom Thorchain Client
@@ -9971,8 +9980,8 @@ class Client extends BaseXChainClient {
         [Network.Mainnet]: 'thorchain-mainnet-v1',
         [Network.Stagenet]: 'thorchain-stagenet-v2',
         [Network.Testnet]: 'deprecated',
-    }, }) {
-        super(Chain.Cosmos, { network, rootDerivationPaths, phrase });
+    }, customRequestHeaders = {}, }) {
+        super(Chain.Cosmos, { network, rootDerivationPaths, phrase, customRequestHeaders });
         /**
          * Get transaction history of a given address with pagination options.
          * By default it will return the transaction history of the current wallet.
@@ -10029,10 +10038,14 @@ class Client extends BaseXChainClient {
         this.chainIds = chainIds;
         registerSendCodecs();
         registerDepositCodecs();
+        if (this.clientUrl[Network.Mainnet].node.includes('ninerealms.com') && !this.customRequestHeaders['x-client-id']) {
+            this.customRequestHeaders['x-client-id'] = 'xchainjs-client';
+        }
         this.cosmosClient = new CosmosSDKClient({
             server: this.getClientUrl().node,
             chainId: this.getChainId(network),
             prefix: getPrefix(network),
+            headers: this.customRequestHeaders,
         });
     }
     /**
@@ -10264,7 +10277,7 @@ class Client extends BaseXChainClient {
      * @throws {"insufficient funds"} Thrown if the wallet has insufficient funds.
      * @throws {"Invalid transaction hash"} Thrown by missing tx hash
      */
-    deposit({ walletIndex = 0, asset = AssetRuneNative, amount, memo, gasLimit = new bignumber(DEPOSIT_GAS_LIMIT_VALUE), }) {
+    deposit({ walletIndex = 0, asset = AssetRuneNative, amount, memo, gasLimit = new bignumber(DEPOSIT_GAS_LIMIT_VALUE), sequence, }) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const balances = yield this.getBalance(this.getAddress(walletIndex));
@@ -10310,7 +10323,7 @@ class Client extends BaseXChainClient {
                 txBody: depositTxBody,
                 signerPubkey: cosmosclient.codec.instanceToProtoAny(signerPubkey),
                 gasLimit: long_1.fromString(gasLimit.toFixed(0)),
-                sequence: account.sequence || long_1.ZERO,
+                sequence: sequence ? long_1.fromNumber(sequence) : account.sequence || long_1.ZERO,
             });
             const txHash = yield this.getCosmosClient().signAndBroadcast(txBuilder, privKey, accountNumber);
             if (!txHash)
@@ -10327,7 +10340,7 @@ class Client extends BaseXChainClient {
      * @throws {"insufficient funds"} Thrown if the wallet has insufficient funds.
      * @throws {"Invalid transaction hash"} Thrown by missing tx hash
      */
-    transfer({ walletIndex = 0, asset = AssetRuneNative, amount, recipient, memo, gasLimit = new bignumber(DEFAULT_GAS_LIMIT_VALUE), }) {
+    transfer({ walletIndex = 0, asset = AssetRuneNative, amount, recipient, memo, gasLimit = new bignumber(DEFAULT_GAS_LIMIT_VALUE), sequence, }) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const balances = yield this.getBalance(this.getAddress(walletIndex));
@@ -10369,7 +10382,7 @@ class Client extends BaseXChainClient {
                 txBody: txBody,
                 gasLimit: long_1.fromString(gasLimit.toString()),
                 signerPubkey: cosmosclient.codec.instanceToProtoAny(signerPubkey),
-                sequence: account.sequence || long_1.ZERO,
+                sequence: sequence ? long_1.fromNumber(sequence) : account.sequence || long_1.ZERO,
             });
             const txHash = yield this.cosmosClient.signAndBroadcast(txBuilder, privKey, accountNumber);
             if (!txHash)
@@ -10458,4 +10471,4 @@ const msgNativeTxFromJson = (value) => {
     return new MsgNativeTx(value.coins, value.memo, cosmosclient.AccAddress.fromString(value.signer));
 };
 
-export { Client, DECIMAL, DEFAULT_GAS_ADJUSTMENT, DEFAULT_GAS_LIMIT_VALUE, DEPOSIT_GAS_LIMIT_VALUE, MAX_TX_COUNT, MsgNativeTx, assetFromDenom, buildDepositTx, buildTransferTx, buildUnsignedTx, defaultExplorerUrls, getBalance, getChainId, getDefaultFees, getDenom, getDepositTxDataFromLogs, getEstimatedGas, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getTxType, isBroadcastSuccess, msgNativeTxFromJson, registerDepositCodecs, registerSendCodecs };
+export { Client, DECIMAL, DEFAULT_GAS_ADJUSTMENT, DEFAULT_GAS_LIMIT_VALUE, DEPOSIT_GAS_LIMIT_VALUE, MAX_TX_COUNT, MsgNativeTx, assetFromDenom, buildDepositTx, buildTransferTx, buildUnsignedTx, defaultExplorerUrls, getAccount, getBalance, getChainId, getDefaultFees, getDenom, getDepositTxDataFromLogs, getEstimatedGas, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getSequence, getTxType, isBroadcastSuccess, msgNativeTxFromJson, registerDepositCodecs, registerSendCodecs };

package/lib/index.js

@@ -9942,7 +9942,16 @@ const getExplorerTxUrl = ({ urls, network, txID, }) => {
         case xchainClient.Network.Testnet:
             return `${url}?network=testnet`;
     }
-};
+};
+const getAccount = (address, client) => {
+    const accAddress = core.cosmosclient.AccAddress.fromString(address);
+    return client.getAccount(accAddress);
+};
+const getSequence = (address, client) => __awaiter(void 0, void 0, void 0, function* () {
+    var _e;
+    const { sequence } = yield getAccount(address, client);
+    return (_e = sequence === null || sequence === void 0 ? void 0 : sequence.toNumber()) !== null && _e !== void 0 ? _e : null;
+});
 
 /**
  * Custom Thorchain Client
@@ -9979,8 +9988,8 @@ class Client extends xchainClient.BaseXChainClient {
         [xchainClient.Network.Mainnet]: 'thorchain-mainnet-v1',
         [xchainClient.Network.Stagenet]: 'thorchain-stagenet-v2',
         [xchainClient.Network.Testnet]: 'deprecated',
-    }, }) {
-        super(xchainUtil.Chain.Cosmos, { network, rootDerivationPaths, phrase });
+    }, customRequestHeaders = {}, }) {
+        super(xchainUtil.Chain.Cosmos, { network, rootDerivationPaths, phrase, customRequestHeaders });
         /**
          * Get transaction history of a given address with pagination options.
          * By default it will return the transaction history of the current wallet.
@@ -10037,10 +10046,14 @@ class Client extends xchainClient.BaseXChainClient {
         this.chainIds = chainIds;
         registerSendCodecs();
         registerDepositCodecs();
+        if (this.clientUrl[xchainClient.Network.Mainnet].node.includes('ninerealms.com') && !this.customRequestHeaders['x-client-id']) {
+            this.customRequestHeaders['x-client-id'] = 'xchainjs-client';
+        }
         this.cosmosClient = new xchainCosmos.CosmosSDKClient({
             server: this.getClientUrl().node,
             chainId: this.getChainId(network),
             prefix: getPrefix(network),
+            headers: this.customRequestHeaders,
         });
     }
     /**
@@ -10272,7 +10285,7 @@ class Client extends xchainClient.BaseXChainClient {
      * @throws {"insufficient funds"} Thrown if the wallet has insufficient funds.
      * @throws {"Invalid transaction hash"} Thrown by missing tx hash
      */
-    deposit({ walletIndex = 0, asset = xchainUtil.AssetRuneNative, amount, memo, gasLimit = new bignumber(DEPOSIT_GAS_LIMIT_VALUE), }) {
+    deposit({ walletIndex = 0, asset = xchainUtil.AssetRuneNative, amount, memo, gasLimit = new bignumber(DEPOSIT_GAS_LIMIT_VALUE), sequence, }) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const balances = yield this.getBalance(this.getAddress(walletIndex));
@@ -10318,7 +10331,7 @@ class Client extends xchainClient.BaseXChainClient {
                 txBody: depositTxBody,
                 signerPubkey: core.cosmosclient.codec.instanceToProtoAny(signerPubkey),
                 gasLimit: long_1.fromString(gasLimit.toFixed(0)),
-                sequence: account.sequence || long_1.ZERO,
+                sequence: sequence ? long_1.fromNumber(sequence) : account.sequence || long_1.ZERO,
             });
             const txHash = yield this.getCosmosClient().signAndBroadcast(txBuilder, privKey, accountNumber);
             if (!txHash)
@@ -10335,7 +10348,7 @@ class Client extends xchainClient.BaseXChainClient {
      * @throws {"insufficient funds"} Thrown if the wallet has insufficient funds.
      * @throws {"Invalid transaction hash"} Thrown by missing tx hash
      */
-    transfer({ walletIndex = 0, asset = xchainUtil.AssetRuneNative, amount, recipient, memo, gasLimit = new bignumber(DEFAULT_GAS_LIMIT_VALUE), }) {
+    transfer({ walletIndex = 0, asset = xchainUtil.AssetRuneNative, amount, recipient, memo, gasLimit = new bignumber(DEFAULT_GAS_LIMIT_VALUE), sequence, }) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const balances = yield this.getBalance(this.getAddress(walletIndex));
@@ -10377,7 +10390,7 @@ class Client extends xchainClient.BaseXChainClient {
                 txBody: txBody,
                 gasLimit: long_1.fromString(gasLimit.toString()),
                 signerPubkey: core.cosmosclient.codec.instanceToProtoAny(signerPubkey),
-                sequence: account.sequence || long_1.ZERO,
+                sequence: sequence ? long_1.fromNumber(sequence) : account.sequence || long_1.ZERO,
             });
             const txHash = yield this.cosmosClient.signAndBroadcast(txBuilder, privKey, accountNumber);
             if (!txHash)
@@ -10478,6 +10491,7 @@ exports.buildDepositTx = buildDepositTx;
 exports.buildTransferTx = buildTransferTx;
 exports.buildUnsignedTx = buildUnsignedTx;
 exports.defaultExplorerUrls = defaultExplorerUrls;
+exports.getAccount = getAccount;
 exports.getBalance = getBalance;
 exports.getChainId = getChainId;
 exports.getDefaultFees = getDefaultFees;
@@ -10488,6 +10502,7 @@ exports.getExplorerAddressUrl = getExplorerAddressUrl;
 exports.getExplorerTxUrl = getExplorerTxUrl;
 exports.getExplorerUrl = getExplorerUrl;
 exports.getPrefix = getPrefix;
+exports.getSequence = getSequence;
 exports.getTxType = getTxType;
 exports.isBroadcastSuccess = isBroadcastSuccess;
 exports.msgNativeTxFromJson = msgNativeTxFromJson;

package/lib/types/client-types.d.ts

@@ -26,6 +26,7 @@ export declare type DepositParam = {
     amount: BaseAmount;
     memo: string;
     gasLimit?: BigNumber;
+    sequence?: number;
 };
 export declare type TxData = Pick<Tx, 'from' | 'to' | 'type'>;
 export declare type TxOfflineParams = TxParams & {

package/lib/util.d.ts

@@ -191,3 +191,5 @@ export declare const getExplorerTxUrl: ({ urls, network, txID, }: {
     network: Network;
     txID: TxHash;
 }) => string;
+export declare const getAccount: (address: string, client: CosmosSDKClient) => Promise<proto.cosmos.auth.v1beta1.IBaseAccount>;
+export declare const getSequence: (address: string, client: CosmosSDKClient) => Promise<number | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain",
-  "version": "0.27.2",
+  "version": "0.27.5",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -36,8 +36,8 @@
   "devDependencies": {
     "@cosmos-client/core": "0.45.13",
     "@types/big.js": "^6.0.0",
-    "@xchainjs/xchain-client": "^0.13.2",
-    "@xchainjs/xchain-cosmos": "^0.20.0",
+    "@xchainjs/xchain-client": "^0.13.3",
+    "@xchainjs/xchain-cosmos": "^0.20.4",
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-util": "^0.11.0",
     "axios": "^0.25.0",
@@ -49,8 +49,8 @@
   },
   "peerDependencies": {
     "@cosmos-client/core": "0.45.13",
-    "@xchainjs/xchain-client": "^0.13.2",
-    "@xchainjs/xchain-cosmos": "^0.19.0",
+    "@xchainjs/xchain-client": "^0.13.3",
+    "@xchainjs/xchain-cosmos": "^0.20.4",
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-util": "^0.11.0",
     "axios": "^0.25.0",