@xchainjs/xchain-thorchain 0.27.5 → 0.27.6

package/README.md

@@ -16,14 +16,13 @@ yarn add @xchainjs/xchain-client @xchainjs/xchain-crypto @xchainjs/xchain-util @
 
 Important note: Make sure to install same version of `@cosmos-client/core` as `xchain-thorchain` is using (currently `@cosmos-client/core@0.45.1` ). In other case things might break.
 
-
 ## Documentation
 
 ### [`xchain thorchain`](http://docs.xchainjs.org/xchain-client/xchain-thorchain/)
+
 [`How xchain-thorchain works`](http://docs.xchainjs.org/xchain-client/xchain-thorchain/how-it-works.html)\
 [`How to use xchain-thorchain`](http://docs.xchainjs.org/xchain-client/xchain-thorchain/how-to-use.html)
 
-
 For more examples check out tests in `./__tests__/client.test.ts`
 
 ## Service Providers
@@ -56,5 +55,25 @@ In order for this library to de/serialize proto3 structures, you can use the fol
    yarn run pbts src/types/proto/MsgCompiled.js -o src/types/proto/MsgCompiled.d.ts
    ```
 
-Alternatively, you can run the convenience script: `genMsgs.sh`, which will overwrite the proto/js files in types/proto. This should only be done and checked in if changes were made to the upstream Msg in the THORNode repo. 
+Alternatively, you can run the convenience script: `genMsgs.sh`, which will overwrite the proto/js files in types/proto. This should only be done and checked in if changes were made to the upstream Msg in the THORNode repo.
+
+### Setting Headers for Nine Realms endpoints
+
+If you plan on using the publically accessible endpoints provided by Nine Realms(listed below), ensure that you add a valid 'x-client-id' to all requests
+
+- https://midgard.ninerealms.com
+- https://haskoin.ninerealms.com (BTC/BCH/LTC)
+- https://thornode.ninerealms.com
+
+Example
+
+```typescript
+import cosmosclient from '@cosmos-client/core'
+import axios from 'axios'
+import { register9Rheader } from '@xchainjs/xchain-util'
+
+register9Rheader(axios)
+register9Rheader(cosmosclient.config.globalAxios)
+```
 
+For a complete example please see this [test](https://github.com/xchainjs/xchainjs-lib/blob/master/packages/xchain-thorchain-amm/__e2e__/wallet.e2e.ts)

package/lib/client.d.ts

@@ -1,4 +1,4 @@
-import { cosmosclient, proto } from '@cosmos-client/core';
+import cosmosclient from '@cosmos-client/core';
 import { Balance, BaseXChainClient, Fees, Network, Tx, TxHash, TxHistoryParams, TxParams, TxsPage, XChainClient, XChainClientParams } from '@xchainjs/xchain-client';
 import { CosmosSDKClient, RPCTxResult } from '@xchainjs/xchain-cosmos';
 import { Address, Asset } from '@xchainjs/xchain-util';
@@ -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, customRequestHeaders, }: XChainClientParams & ThorchainClientParams);
+    constructor({ network, phrase, clientUrl, explorerUrls, rootDerivationPaths, chainIds, }: XChainClientParams & ThorchainClientParams);
     /**
      * Set/update the current network.
      *
@@ -115,7 +115,7 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
      * @throws {"Phrase not set"}
      * Throws an error if phrase has not been set before
      * */
-    getPrivateKey(index?: number): proto.cosmos.crypto.secp256k1.PrivKey;
+    getPrivateKey(index?: number): cosmosclient.proto.cosmos.crypto.secp256k1.PrivKey;
     /**
      * Get public key
      *

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { cosmosclient, proto, rest } from '@cosmos-client/core';
+import cosmosclient from '@cosmos-client/core';
 import { Network, TxType, singleFee, FeeType, BaseXChainClient } from '@xchainjs/xchain-client';
 import { CosmosSDKClient } from '@xchainjs/xchain-cosmos';
 import { isAssetRuneNative, isSynthAsset, assetToString, AssetRuneNative, assetFromString, baseAmount, assetToBase, assetAmount, Chain } from '@xchainjs/xchain-util';
@@ -9764,13 +9764,13 @@ const getChainId = (nodeUrl) => __awaiter(void 0, void 0, void 0, function* () {
  * @returns
  */
 const buildUnsignedTx = ({ cosmosSdk, txBody, signerPubkey, sequence, gasLimit, }) => {
-    const authInfo = new proto.cosmos.tx.v1beta1.AuthInfo({
+    const authInfo = new cosmosclient.proto.cosmos.tx.v1beta1.AuthInfo({
         signer_infos: [
             {
                 public_key: signerPubkey,
                 mode_info: {
                     single: {
-                        mode: proto.cosmos.tx.signing.v1beta1.SignMode.SIGN_MODE_DIRECT,
+                        mode: cosmosclient.proto.cosmos.tx.signing.v1beta1.SignMode.SIGN_MODE_DIRECT,
                     },
                 },
                 sequence: sequence,
@@ -9801,7 +9801,7 @@ const getEstimatedGas = ({ cosmosSDKClient, txBody, privKey, accountNumber, acco
     });
     const signDocBytes = txBuilder.signDocBytes(accountNumber);
     txBuilder.addSignature(privKey.sign(signDocBytes));
-    const resp = yield rest.tx.simulate(cosmosSDKClient.sdk, { tx_bytes: txBuilder.txBytes() });
+    const resp = yield cosmosclient.rest.tx.simulate(cosmosSDKClient.sdk, { tx_bytes: txBuilder.txBytes() });
     const estimatedGas = (_d = (_c = (_b = resp.data) === null || _b === void 0 ? void 0 : _b.gas_info) === null || _c === void 0 ? void 0 : _c.gas_used) !== null && _d !== void 0 ? _d : null;
     if (!estimatedGas) {
         throw new Error('Could not get data of estimated gas');
@@ -9832,7 +9832,7 @@ const buildDepositTx = ({ msgNativeTx, nodeUrl, chainId, }) => __awaiter(void 0,
         signer: signerDecoded.data,
     };
     const depositMsg = MsgCompiled.types.MsgDeposit.fromObject(msgDepositObj);
-    return new proto.cosmos.tx.v1beta1.TxBody({
+    return new cosmosclient.proto.cosmos.tx.v1beta1.TxBody({
         messages: [cosmosclient.codec.instanceToProtoAny(depositMsg)],
         memo: msgNativeTx.memo,
     });
@@ -9866,7 +9866,7 @@ const buildTransferTx = ({ fromAddress, toAddress, assetAmount, assetDenom, memo
         ],
     };
     const transferMsg = MsgCompiled.types.MsgSend.fromObject(transferObj);
-    return new proto.cosmos.tx.v1beta1.TxBody({
+    return new cosmosclient.proto.cosmos.tx.v1beta1.TxBody({
         messages: [cosmosclient.codec.instanceToProtoAny(transferMsg)],
         memo,
     });
@@ -9980,8 +9980,8 @@ class Client extends BaseXChainClient {
         [Network.Mainnet]: 'thorchain-mainnet-v1',
         [Network.Stagenet]: 'thorchain-stagenet-v2',
         [Network.Testnet]: 'deprecated',
-    }, customRequestHeaders = {}, }) {
-        super(Chain.Cosmos, { network, rootDerivationPaths, phrase, customRequestHeaders });
+    }, }) {
+        super(Chain.Cosmos, { network, rootDerivationPaths, phrase });
         /**
          * Get transaction history of a given address with pagination options.
          * By default it will return the transaction history of the current wallet.
@@ -10038,14 +10038,10 @@ 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,
         });
     }
     /**

package/lib/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var core = require('@cosmos-client/core');
+var cosmosclient = require('@cosmos-client/core');
 var xchainClient = require('@xchainjs/xchain-client');
 var xchainCosmos = require('@xchainjs/xchain-cosmos');
 var xchainUtil = require('@xchainjs/xchain-util');
@@ -11,6 +11,7 @@ var bech32Buffer = require('bech32-buffer');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var cosmosclient__default = /*#__PURE__*/_interopDefaultLegacy(cosmosclient);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 
 /*! *****************************************************************************
@@ -9688,13 +9689,13 @@ const getPrefix = (network) => {
  * Register type for encoding `MsgDeposit` messages
  */
 const registerDepositCodecs = () => {
-    core.cosmosclient.codec.register('/types.MsgDeposit', MsgCompiled.types.MsgDeposit);
+    cosmosclient__default['default'].codec.register('/types.MsgDeposit', MsgCompiled.types.MsgDeposit);
 };
 /**
  * Register type for encoding `MsgSend` messages
  */
 const registerSendCodecs = () => {
-    core.cosmosclient.codec.register('/types.MsgSend', MsgCompiled.types.MsgSend);
+    cosmosclient__default['default'].codec.register('/types.MsgSend', MsgCompiled.types.MsgSend);
 };
 /**
  * Parse transaction data from event logs
@@ -9772,13 +9773,13 @@ const getChainId = (nodeUrl) => __awaiter(void 0, void 0, void 0, function* () {
  * @returns
  */
 const buildUnsignedTx = ({ cosmosSdk, txBody, signerPubkey, sequence, gasLimit, }) => {
-    const authInfo = new core.proto.cosmos.tx.v1beta1.AuthInfo({
+    const authInfo = new cosmosclient__default['default'].proto.cosmos.tx.v1beta1.AuthInfo({
         signer_infos: [
             {
                 public_key: signerPubkey,
                 mode_info: {
                     single: {
-                        mode: core.proto.cosmos.tx.signing.v1beta1.SignMode.SIGN_MODE_DIRECT,
+                        mode: cosmosclient__default['default'].proto.cosmos.tx.signing.v1beta1.SignMode.SIGN_MODE_DIRECT,
                     },
                 },
                 sequence: sequence,
@@ -9789,7 +9790,7 @@ const buildUnsignedTx = ({ cosmosSdk, txBody, signerPubkey, sequence, gasLimit,
             gas_limit: gasLimit || null,
         },
     });
-    return new core.cosmosclient.TxBuilder(cosmosSdk, txBody, authInfo);
+    return new cosmosclient__default['default'].TxBuilder(cosmosSdk, txBody, authInfo);
 };
 /**
  * Estimates usage of gas
@@ -9804,12 +9805,12 @@ const getEstimatedGas = ({ cosmosSDKClient, txBody, privKey, accountNumber, acco
     const txBuilder = buildUnsignedTx({
         cosmosSdk: cosmosSDKClient.sdk,
         txBody: txBody,
-        signerPubkey: core.cosmosclient.codec.instanceToProtoAny(pubKey),
+        signerPubkey: cosmosclient__default['default'].codec.instanceToProtoAny(pubKey),
         sequence: accountSequence,
     });
     const signDocBytes = txBuilder.signDocBytes(accountNumber);
     txBuilder.addSignature(privKey.sign(signDocBytes));
-    const resp = yield core.rest.tx.simulate(cosmosSDKClient.sdk, { tx_bytes: txBuilder.txBytes() });
+    const resp = yield cosmosclient__default['default'].rest.tx.simulate(cosmosSDKClient.sdk, { tx_bytes: txBuilder.txBytes() });
     const estimatedGas = (_d = (_c = (_b = resp.data) === null || _b === void 0 ? void 0 : _b.gas_info) === null || _c === void 0 ? void 0 : _c.gas_used) !== null && _d !== void 0 ? _d : null;
     if (!estimatedGas) {
         throw new Error('Could not get data of estimated gas');
@@ -9840,8 +9841,8 @@ const buildDepositTx = ({ msgNativeTx, nodeUrl, chainId, }) => __awaiter(void 0,
         signer: signerDecoded.data,
     };
     const depositMsg = MsgCompiled.types.MsgDeposit.fromObject(msgDepositObj);
-    return new core.proto.cosmos.tx.v1beta1.TxBody({
-        messages: [core.cosmosclient.codec.instanceToProtoAny(depositMsg)],
+    return new cosmosclient__default['default'].proto.cosmos.tx.v1beta1.TxBody({
+        messages: [cosmosclient__default['default'].codec.instanceToProtoAny(depositMsg)],
         memo: msgNativeTx.memo,
     });
 });
@@ -9874,8 +9875,8 @@ const buildTransferTx = ({ fromAddress, toAddress, assetAmount, assetDenom, memo
         ],
     };
     const transferMsg = MsgCompiled.types.MsgSend.fromObject(transferObj);
-    return new core.proto.cosmos.tx.v1beta1.TxBody({
-        messages: [core.cosmosclient.codec.instanceToProtoAny(transferMsg)],
+    return new cosmosclient__default['default'].proto.cosmos.tx.v1beta1.TxBody({
+        messages: [cosmosclient__default['default'].codec.instanceToProtoAny(transferMsg)],
         memo,
     });
 });
@@ -9944,7 +9945,7 @@ const getExplorerTxUrl = ({ urls, network, txID, }) => {
     }
 };
 const getAccount = (address, client) => {
-    const accAddress = core.cosmosclient.AccAddress.fromString(address);
+    const accAddress = cosmosclient__default['default'].AccAddress.fromString(address);
     return client.getAccount(accAddress);
 };
 const getSequence = (address, client) => __awaiter(void 0, void 0, void 0, function* () {
@@ -9988,8 +9989,8 @@ class Client extends xchainClient.BaseXChainClient {
         [xchainClient.Network.Mainnet]: 'thorchain-mainnet-v1',
         [xchainClient.Network.Stagenet]: 'thorchain-stagenet-v2',
         [xchainClient.Network.Testnet]: 'deprecated',
-    }, customRequestHeaders = {}, }) {
-        super(xchainUtil.Chain.Cosmos, { network, rootDerivationPaths, phrase, customRequestHeaders });
+    }, }) {
+        super(xchainUtil.Chain.Cosmos, { network, rootDerivationPaths, phrase });
         /**
          * Get transaction history of a given address with pagination options.
          * By default it will return the transaction history of the current wallet.
@@ -10046,14 +10047,10 @@ 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,
         });
     }
     /**
@@ -10307,7 +10304,7 @@ class Client extends xchainClient.BaseXChainClient {
             const privKey = this.getPrivateKey(walletIndex);
             const signerPubkey = privKey.pubKey();
             const fromAddress = this.getAddress(walletIndex);
-            const fromAddressAcc = core.cosmosclient.AccAddress.fromString(fromAddress);
+            const fromAddressAcc = cosmosclient__default['default'].AccAddress.fromString(fromAddress);
             const depositTxBody = yield buildDepositTx({
                 msgNativeTx: {
                     memo: memo,
@@ -10329,7 +10326,7 @@ class Client extends xchainClient.BaseXChainClient {
             const txBuilder = buildUnsignedTx({
                 cosmosSdk: this.getCosmosClient().sdk,
                 txBody: depositTxBody,
-                signerPubkey: core.cosmosclient.codec.instanceToProtoAny(signerPubkey),
+                signerPubkey: cosmosclient__default['default'].codec.instanceToProtoAny(signerPubkey),
                 gasLimit: long_1.fromString(gasLimit.toFixed(0)),
                 sequence: sequence ? long_1.fromNumber(sequence) : account.sequence || long_1.ZERO,
             });
@@ -10370,7 +10367,7 @@ class Client extends xchainClient.BaseXChainClient {
             const privKey = this.getPrivateKey(walletIndex);
             const from = this.getAddress(walletIndex);
             const signerPubkey = privKey.pubKey();
-            const accAddress = core.cosmosclient.AccAddress.fromString(from);
+            const accAddress = cosmosclient__default['default'].AccAddress.fromString(from);
             const denom = getDenom(asset);
             const txBody = yield buildTransferTx({
                 fromAddress: from,
@@ -10389,7 +10386,7 @@ class Client extends xchainClient.BaseXChainClient {
                 cosmosSdk: this.getCosmosClient().sdk,
                 txBody: txBody,
                 gasLimit: long_1.fromString(gasLimit.toString()),
-                signerPubkey: core.cosmosclient.codec.instanceToProtoAny(signerPubkey),
+                signerPubkey: cosmosclient__default['default'].codec.instanceToProtoAny(signerPubkey),
                 sequence: sequence ? long_1.fromNumber(sequence) : account.sequence || long_1.ZERO,
             });
             const txHash = yield this.cosmosClient.signAndBroadcast(txBuilder, privKey, accountNumber);
@@ -10433,7 +10430,7 @@ class Client extends xchainClient.BaseXChainClient {
                 cosmosSdk: this.getCosmosClient().sdk,
                 txBody: txBody,
                 gasLimit: long_1.fromString(gasLimit.toFixed(0)),
-                signerPubkey: core.cosmosclient.codec.instanceToProtoAny(privKey.pubKey()),
+                signerPubkey: cosmosclient__default['default'].codec.instanceToProtoAny(privKey.pubKey()),
                 sequence: fromSequence,
             });
             const signDocBytes = txBuilder.signDocBytes(fromAccountNumber);
@@ -10476,7 +10473,7 @@ class MsgNativeTx {
  * @returns {MsgNativeTx}
  */
 const msgNativeTxFromJson = (value) => {
-    return new MsgNativeTx(value.coins, value.memo, core.cosmosclient.AccAddress.fromString(value.signer));
+    return new MsgNativeTx(value.coins, value.memo, cosmosclient__default['default'].AccAddress.fromString(value.signer));
 };
 
 exports.Client = Client;

package/lib/types/messages.d.ts

@@ -1,4 +1,4 @@
-import { cosmosclient, proto } from '@cosmos-client/core';
+import cosmosclient from '@cosmos-client/core';
 import { Asset } from '@xchainjs/xchain-util';
 export declare type MsgCoin = {
     asset: Asset;
@@ -31,7 +31,7 @@ export declare type ThorchainDepositResponse = AminoWrapping<{
         memo: string;
         signer: string;
     }>[];
-    fee: proto.cosmos.tx.v1beta1.Fee;
+    fee: cosmosclient.proto.cosmos.tx.v1beta1.Fee;
     signatures: string[];
     memo: string;
     timeout_height: string;

package/lib/util.d.ts

@@ -1,4 +1,4 @@
-import { cosmosclient, proto } from '@cosmos-client/core';
+import cosmosclient from '@cosmos-client/core';
 import { Balance, Fees, Network, TxHash } from '@xchainjs/xchain-client';
 import { CosmosSDKClient, TxLog } from '@xchainjs/xchain-cosmos';
 import { Address, Asset, BaseAmount } from '@xchainjs/xchain-util';
@@ -87,8 +87,8 @@ export declare const getChainId: (nodeUrl: string) => Promise<ChainId>;
  */
 export declare const buildUnsignedTx: ({ cosmosSdk, txBody, signerPubkey, sequence, gasLimit, }: {
     cosmosSdk: cosmosclient.CosmosSDK;
-    txBody: proto.cosmos.tx.v1beta1.TxBody;
-    signerPubkey: proto.google.protobuf.Any;
+    txBody: cosmosclient.proto.cosmos.tx.v1beta1.TxBody;
+    signerPubkey: cosmosclient.proto.google.protobuf.Any;
     sequence: Long;
     gasLimit?: Long.Long | undefined;
 }) => cosmosclient.TxBuilder;
@@ -101,8 +101,8 @@ export declare const buildUnsignedTx: ({ cosmosSdk, txBody, signerPubkey, sequen
  */
 export declare const getEstimatedGas: ({ cosmosSDKClient, txBody, privKey, accountNumber, accountSequence, multiplier, }: {
     cosmosSDKClient: CosmosSDKClient;
-    txBody: proto.cosmos.tx.v1beta1.TxBody;
-    privKey: proto.cosmos.crypto.secp256k1.PrivKey;
+    txBody: cosmosclient.proto.cosmos.tx.v1beta1.TxBody;
+    privKey: cosmosclient.proto.cosmos.crypto.secp256k1.PrivKey;
     accountNumber: Long;
     accountSequence: Long;
     multiplier?: number | undefined;
@@ -122,7 +122,7 @@ export declare const buildDepositTx: ({ msgNativeTx, nodeUrl, chainId, }: {
     msgNativeTx: MsgNativeTx;
     nodeUrl: string;
     chainId: ChainId;
-}) => Promise<proto.cosmos.tx.v1beta1.TxBody>;
+}) => Promise<cosmosclient.proto.cosmos.tx.v1beta1.TxBody>;
 /**
  * Structure a MsgSend
  *
@@ -142,7 +142,7 @@ export declare const buildTransferTx: ({ fromAddress, toAddress, assetAmount, as
     memo?: string | undefined;
     nodeUrl: string;
     chainId: ChainId;
-}) => Promise<proto.cosmos.tx.v1beta1.TxBody>;
+}) => Promise<cosmosclient.proto.cosmos.tx.v1beta1.TxBody>;
 /**
  * Get the balance of a given address.
  *
@@ -191,5 +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 getAccount: (address: string, client: CosmosSDKClient) => Promise<cosmosclient.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.5",
+  "version": "0.27.6",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -34,10 +34,10 @@
     "generate:ThorchainMsgs": "./genMsgs.sh"
   },
   "devDependencies": {
-    "@cosmos-client/core": "0.45.13",
+    "@cosmos-client/core": "0.46.1",
     "@types/big.js": "^6.0.0",
     "@xchainjs/xchain-client": "^0.13.3",
-    "@xchainjs/xchain-cosmos": "^0.20.4",
+    "@xchainjs/xchain-cosmos": "^0.20.5",
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-util": "^0.11.0",
     "axios": "^0.25.0",
@@ -48,9 +48,9 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@cosmos-client/core": "0.45.13",
+    "@cosmos-client/core": "0.46.1",
     "@xchainjs/xchain-client": "^0.13.3",
-    "@xchainjs/xchain-cosmos": "^0.20.4",
+    "@xchainjs/xchain-cosmos": "^0.20.5",
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-util": "^0.11.0",
     "axios": "^0.25.0",