@injectivelabs/sdk-ts 1.16.5 → 1.16.6-alpha.0

package/README.md

@@ -33,7 +33,7 @@ We highly suggest using the `@injectivelabs/sdk-ts` with TypeScript, or JavaScri
 ### 📚 Installation
 
 ```bash
-yarn add @injectivelabs/sdk-ts
+pnpm add @injectivelabs/sdk-ts
 ```
 
 ---

package/dist/cjs/client/indexer/grpc/IndexerGrpcTransactionApi.d.ts

@@ -1,10 +1,10 @@
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 import { InjectiveExchangeRpc } from '@injectivelabs/indexer-proto-ts';
 import { CosmosTxV1Beta1Tx } from '@injectivelabs/core-proto-ts';
 import BaseGrpcConsumer from '../../base/BaseIndexerGrpcConsumer.js';
 interface PrepareTxArgs {
     address: AccountAddress;
-    chainId: EthereumChainId;
+    chainId: EvmChainId;
     message: any;
     estimateGas?: boolean;
     gasLimit?: number;
@@ -41,7 +41,7 @@ export declare class IndexerGrpcTransactionApi extends BaseGrpcConsumer {
      */
     broadcastTxRequest({ signature, chainId, message, txResponse, }: {
         signature: string;
-        chainId: EthereumChainId;
+        chainId: EvmChainId;
         useCorrectEIP712Hash?: boolean;
         txResponse: InjectiveExchangeRpc.PrepareTxResponse;
         message: Record<string, any>;

package/dist/cjs/client/indexer/grpc/IndexerGrpcWeb3GwApi.d.ts

@@ -1,4 +1,4 @@
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 import { InjectiveExchangeRpc } from '@injectivelabs/indexer-proto-ts';
 import { IndexerGrpcTransactionApi } from './IndexerGrpcTransactionApi.js';
 /**
@@ -9,7 +9,7 @@ export declare class IndexerGrpcWeb3GwApi extends IndexerGrpcTransactionApi {
     constructor(endpoint: string);
     prepareEip712Request({ address, chainId, message, memo, sequence, accountNumber, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, eip712Version, }: {
         address: AccountAddress;
-        chainId: EthereumChainId;
+        chainId: EvmChainId;
         message: any;
         estimateGas?: boolean;
         gasLimit?: number;

package/dist/cjs/core/accounts/PrivateKey.d.ts

@@ -1,6 +1,6 @@
-import { PublicKey } from './PublicKey.js';
-import { Address } from './Address.js';
 import { CosmosTxV1Beta1Tx } from '@injectivelabs/core-proto-ts';
+import { Address } from './Address.js';
+import { PublicKey } from './PublicKey.js';
 /**
  * Class for wrapping SigningKey that is used for signature creation and public key derivation.
  *

package/dist/cjs/core/accounts/PrivateKey.js

@@ -4,19 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrivateKey = void 0;
-const bip39_1 = require("bip39");
-const ethers_1 = require("ethers");
 const secp256k1_1 = __importDefault(require("secp256k1"));
 const keccak256_1 = __importDefault(require("keccak256"));
-const PublicKey_js_1 = require("./PublicKey.js");
-const Address_js_1 = require("./Address.js");
+const bip39_1 = require("bip39");
+const core_proto_ts_1 = require("@injectivelabs/core-proto-ts");
+const exceptions_1 = require("@injectivelabs/exceptions");
+const ts_types_1 = require("@injectivelabs/ts-types");
+const ethers_1 = require("ethers");
 const eth_sig_util_1 = require("@metamask/eth-sig-util");
 const index_js_1 = require("../../utils/index.js");
-const core_proto_ts_1 = require("@injectivelabs/core-proto-ts");
+const Address_js_1 = require("./Address.js");
+const PublicKey_js_1 = require("./PublicKey.js");
 const tx_js_1 = require("../tx/utils/tx.js");
 const index_js_2 = require("../tx/eip712/index.js");
-const exceptions_1 = require("@injectivelabs/exceptions");
-const ts_types_1 = require("@injectivelabs/ts-types");
 /**
  * Class for wrapping SigningKey that is used for signature creation and public key derivation.
  *
@@ -266,31 +266,31 @@ class PrivateKey {
         const getChainIds = () => {
             if (!body.extensionOptions.length) {
                 return {
-                    ethereumChainId: ts_types_1.EthereumChainId.Mainnet,
                     chainId: ts_types_1.ChainId.Mainnet,
+                    EvmChainId: ts_types_1.EvmChainId.Mainnet,
                 };
             }
             const extension = body.extensionOptions.find((extension) => extension.typeUrl.includes('ExtensionOptionsWeb3Tx'));
             if (!extension) {
                 return {
-                    ethereumChainId: ts_types_1.EthereumChainId.Mainnet,
                     chainId: ts_types_1.ChainId.Mainnet,
+                    EvmChainId: ts_types_1.EvmChainId.Mainnet,
                 };
             }
             const decodedExtension = core_proto_ts_1.InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx.decode(extension.value);
-            const ethereumChainId = Number(decodedExtension.typedDataChainID);
+            const evmChainId = Number(decodedExtension.typedDataChainID);
             return {
-                ethereumChainId: ethereumChainId,
+                evmChainId: ts_types_1.EvmChainId,
                 chainId: [
-                    ts_types_1.EthereumChainId.Goerli,
-                    ts_types_1.EthereumChainId.Kovan,
-                    ts_types_1.EthereumChainId.Sepolia,
-                ].includes(ethereumChainId)
+                    ts_types_1.EvmChainId.Kovan,
+                    ts_types_1.EvmChainId.Goerli,
+                    ts_types_1.EvmChainId.Sepolia,
+                ].includes(evmChainId)
                     ? ts_types_1.ChainId.Testnet
                     : ts_types_1.ChainId.Mainnet,
             };
         };
-        const { ethereumChainId, chainId } = getChainIds();
+        const { evmChainId, chainId } = getChainIds();
         const [signerInfo] = authInfo.signerInfos;
         const [signature] = signatures;
         const [msg] = body.messages;
@@ -305,7 +305,7 @@ class PrivateKey {
                 timeoutHeight: body.timeoutHeight.toString(),
                 chainId,
             },
-            ethereumChainId,
+            evmChainId: evmChainId,
         });
         return this.verifySignature({
             eip712: eip712TypedData,

package/dist/cjs/core/modules/wasm/msgs/MsgExecuteContract.d.ts

@@ -53,6 +53,7 @@ export default class MsgExecuteContract extends MsgBase<MsgExecuteContract.Param
         msg: any;
         '@type': string;
     };
+    toEip712(): never;
     toDirectSign(): {
         type: string;
         message: CosmwasmWasmV1Tx.MsgExecuteContract;

package/dist/cjs/core/modules/wasm/msgs/MsgExecuteContract.js

@@ -62,13 +62,9 @@ class MsgExecuteContract extends MsgBase_js_1.MsgBase {
             ...value,
         };
     }
-    // public toEip712(): never {
-    //   throw new GeneralException(
-    //     new Error(
-    //       'EIP712_v1 is not supported for MsgExecuteContract. Please use EIP712_v2',
-    //     ),
-    //   )
-    // }
+    toEip712() {
+        throw new exceptions_1.GeneralException(new Error('EIP712_v1 is not supported for MsgExecuteContract. Please use EIP712_v2'));
+    }
     toDirectSign() {
         const proto = this.toProto();
         return {

package/dist/cjs/core/tx/broadcaster/MsgBroadcasterWithPk.d.ts

@@ -1,6 +1,6 @@
 import { PrivateKey } from '../../accounts/index.js';
 import { Msgs } from '../../modules/msgs.js';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { Network, NetworkEndpoints } from '@injectivelabs/networks';
 import { AccountDetails } from '../../../types/auth.js';
 interface MsgBroadcasterTxOptions {
@@ -25,7 +25,7 @@ interface MsgBroadcasterWithPkOptions {
         rest: string;
     };
     privateKey: string | PrivateKey;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     chainId?: ChainId;
     simulateTx?: boolean;
     loggingEnabled?: boolean;
@@ -45,7 +45,7 @@ interface MsgBroadcasterWithPkOptions {
 export declare class MsgBroadcasterWithPk {
     endpoints: NetworkEndpoints;
     chainId: ChainId;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     privateKey: PrivateKey;
     simulateTx: boolean;
     txTimeoutOnFeeDelegation: boolean;

package/dist/cjs/core/tx/broadcaster/MsgBroadcasterWithPk.js

@@ -23,7 +23,7 @@ const index_js_5 = require("../../../json/index.js");
 class MsgBroadcasterWithPk {
     endpoints;
     chainId;
-    ethereumChainId;
+    evmChainId;
     privateKey;
     simulateTx = false;
     txTimeoutOnFeeDelegation = false;
@@ -39,8 +39,7 @@ class MsgBroadcasterWithPk {
         this.simulateTx = options.simulateTx || false;
         this.chainId = options.chainId || networkInfo.chainId;
         this.txTimeout = options.txTimeout || utils_1.DEFAULT_BLOCK_TIMEOUT_HEIGHT;
-        this.ethereumChainId =
-            options.ethereumChainId || networkInfo.ethereumChainId;
+        this.evmChainId = options.evmChainId || networkInfo.evmChainId;
         this.endpoints = { ...endpoints, ...(options.endpoints || {}) };
         this.privateKey =
             options.privateKey instanceof index_js_1.PrivateKey
@@ -70,7 +69,7 @@ class MsgBroadcasterWithPk {
      * @returns {string} transaction hash
      */
     async broadcastWithFeeDelegation(transaction) {
-        const { simulateTx, privateKey, ethereumChainId, endpoints, txTimeoutOnFeeDelegation, txTimeout, } = this;
+        const { endpoints, txTimeout, simulateTx, privateKey, evmChainId, txTimeoutOnFeeDelegation, } = this;
         const ethereumWallet = this.privateKey.toHex();
         if (index_js_5.ofacWallets.includes(ethereumWallet)) {
             throw new exceptions_1.GeneralException(new Error('You cannot execute this transaction'));
@@ -84,7 +83,7 @@ class MsgBroadcasterWithPk {
             ethereumAddress: ethereumWallet,
         };
         const web3Msgs = msgs.map((msg) => msg.toWeb3());
-        if (!ethereumChainId) {
+        if (!evmChainId) {
             throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
         }
         let timeoutHeight = undefined;
@@ -100,7 +99,7 @@ class MsgBroadcasterWithPk {
             memo: tx.memo,
             message: web3Msgs,
             address: tx.ethereumAddress,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
             gasLimit: (0, msgs_js_1.getGasPriceBasedOnMessage)(msgs),
             estimateGas: simulateTx || false,
             timeoutHeight,
@@ -109,7 +108,7 @@ class MsgBroadcasterWithPk {
         const response = await transactionApi.broadcastTxRequest({
             txResponse,
             message: web3Msgs,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
             signature: `0x${Buffer.from(signature).toString('hex')}`,
         });
         return await new TxGrpcApi_js_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);

package/dist/cjs/core/tx/eip712/eip712.d.ts

@@ -1,11 +1,11 @@
 import { Msgs } from '../../modules/msgs.js';
-import { EthereumChainId } from '@injectivelabs/ts-types';
+import { EvmChainId } from '@injectivelabs/ts-types';
 import { Eip712ConvertFeeArgs, Eip712ConvertTxArgs } from './types.js';
-export declare const getEip712TypedData: ({ msgs, tx, fee, ethereumChainId, }: {
+export declare const getEip712TypedData: ({ msgs, tx, fee, evmChainId, }: {
     msgs: Msgs | Msgs[];
     tx: Eip712ConvertTxArgs;
     fee?: Eip712ConvertFeeArgs;
-    ethereumChainId: EthereumChainId;
+    evmChainId: EvmChainId;
 }) => {
     message: {
         msgs: {
@@ -57,11 +57,11 @@ export declare const getEip712TypedData: ({ msgs, tx, fee, ethereumChainId, }: {
         }[];
     };
 };
-export declare const getEip712TypedDataV2: ({ msgs, tx, fee, ethereumChainId, }: {
+export declare const getEip712TypedDataV2: ({ msgs, tx, fee, evmChainId, }: {
     msgs: Msgs | Msgs[];
     tx: Eip712ConvertTxArgs;
     fee?: Eip712ConvertFeeArgs;
-    ethereumChainId: EthereumChainId;
+    evmChainId: EvmChainId;
 }) => {
     message: {
         context: string;

package/dist/cjs/core/tx/eip712/eip712.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEip712TypedDataV2 = exports.getEip712TypedData = void 0;
 const utils_js_1 = require("./utils.js");
 const utils_js_2 = require("./utils.js");
-const getEip712TypedData = ({ msgs, tx, fee, ethereumChainId, }) => {
+const getEip712TypedData = ({ msgs, tx, fee, evmChainId, }) => {
     const messages = Array.isArray(msgs) ? msgs : [msgs];
     const eip712Msgs = messages.map((m) => m.toEip712());
     const eip712MessageTypes = messages[0].toEip712Types();
@@ -21,7 +21,7 @@ const getEip712TypedData = ({ msgs, tx, fee, ethereumChainId, }) => {
     return {
         ...typesWithFeePayer,
         primaryType: 'Tx',
-        ...(0, utils_js_1.getEip712Domain)(ethereumChainId),
+        ...(0, utils_js_1.getEip712Domain)(evmChainId),
         message: {
             ...(0, utils_js_1.getEipTxDetails)(tx),
             ...(0, utils_js_1.getEip712Fee)(fee),
@@ -30,14 +30,14 @@ const getEip712TypedData = ({ msgs, tx, fee, ethereumChainId, }) => {
     };
 };
 exports.getEip712TypedData = getEip712TypedData;
-const getEip712TypedDataV2 = ({ msgs, tx, fee, ethereumChainId, }) => {
+const getEip712TypedDataV2 = ({ msgs, tx, fee, evmChainId, }) => {
     const messages = Array.isArray(msgs) ? msgs : [msgs];
     const eip712Msgs = messages.map((m) => m.toEip712V2());
     const types = (0, utils_js_1.getDefaultEip712TypesV2)();
     return {
         ...types,
         primaryType: 'Tx',
-        ...(0, utils_js_1.getEip712DomainV2)(ethereumChainId),
+        ...(0, utils_js_1.getEip712DomainV2)(evmChainId),
         message: {
             context: JSON.stringify((0, utils_js_2.getEipTxContext)({ ...tx, fee })),
             msgs: JSON.stringify(eip712Msgs),

package/dist/cjs/core/tx/eip712/utils.d.ts

@@ -1,6 +1,6 @@
-import { EthereumChainId } from '@injectivelabs/ts-types';
+import { EvmChainId } from '@injectivelabs/ts-types';
 import { Eip712ConvertFeeArgs, Eip712ConvertTxArgs } from './types.js';
-export declare const getEip712Domain: (ethereumChainId: EthereumChainId) => {
+export declare const getEip712Domain: (evmChainId: EvmChainId) => {
     domain: {
         name: string;
         version: string;
@@ -9,7 +9,7 @@ export declare const getEip712Domain: (ethereumChainId: EthereumChainId) => {
         verifyingContract: string;
     };
 };
-export declare const getEip712DomainV2: (ethereumChainId: EthereumChainId) => {
+export declare const getEip712DomainV2: (evmChainId: EvmChainId) => {
     domain: {
         name: string;
         version: string;

package/dist/cjs/core/tx/eip712/utils.js

@@ -2,24 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEipTxContext = exports.getEipTxDetails = exports.getTypesIncludingFeePayer = exports.getEip712FeeV2 = exports.getEip712Fee = exports.getDefaultEip712TypesV2 = exports.getDefaultEip712Types = exports.getEip712DomainV2 = exports.getEip712Domain = void 0;
 const utils_1 = require("@injectivelabs/utils");
-const getEip712Domain = (ethereumChainId) => {
+const getEip712Domain = (evmChainId) => {
     return {
         domain: {
             name: 'Injective Web3',
             version: '1.0.0',
-            chainId: '0x' + new utils_1.BigNumberInBase(ethereumChainId).toString(16),
+            chainId: '0x' + new utils_1.BigNumberInBase(evmChainId).toString(16),
             salt: '0',
             verifyingContract: 'cosmos',
         },
     };
 };
 exports.getEip712Domain = getEip712Domain;
-const getEip712DomainV2 = (ethereumChainId) => {
+const getEip712DomainV2 = (evmChainId) => {
     return {
         domain: {
             name: 'Injective Web3',
             version: '1.0.0',
-            chainId: '0x' + new utils_1.BigNumberInBase(ethereumChainId).toString(16),
+            chainId: '0x' + new utils_1.BigNumberInBase(evmChainId).toString(16),
             verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
             salt: '0',
         },

package/dist/cjs/core/tx/utils/tx.d.ts

@@ -1,4 +1,4 @@
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { Msgs } from '../../modules/msgs.js';
 import { GoogleProtobufAny, CosmosTxV1Beta1Tx, InjectiveTypesV1Beta1TxExt, CosmosTxSigningV1Beta1Signing } from '@injectivelabs/core-proto-ts';
 export declare const getPublicKey: ({ chainId, key, }: {
@@ -49,8 +49,8 @@ export declare const createSignDocFromTransaction: (args: {
     accountNumber: number;
 }) => CosmosTxV1Beta1Tx.SignDoc;
 export declare const createTxRawEIP712: (txRaw: CosmosTxV1Beta1Tx.TxRaw, extension: InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx, nonCriticalExtension?: GoogleProtobufAny.Any | GoogleProtobufAny.Any[]) => CosmosTxV1Beta1Tx.TxRaw;
-export declare const createWeb3Extension: ({ ethereumChainId, feePayer, feePayerSig, }: {
-    ethereumChainId: EthereumChainId;
+export declare const createWeb3Extension: ({ evmChainId, feePayer, feePayerSig, }: {
+    evmChainId: EvmChainId;
     feePayer?: string;
     feePayerSig?: Uint8Array;
 }) => InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx;

package/dist/cjs/core/tx/utils/tx.js

@@ -120,9 +120,9 @@ const createTxRawEIP712 = (txRaw, extension, nonCriticalExtension) => {
     return txRaw;
 };
 exports.createTxRawEIP712 = createTxRawEIP712;
-const createWeb3Extension = ({ ethereumChainId, feePayer, feePayerSig, }) => {
+const createWeb3Extension = ({ evmChainId, feePayer, feePayerSig, }) => {
     const web3Extension = core_proto_ts_1.InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx.create();
-    web3Extension.typedDataChainID = ethereumChainId.toString();
+    web3Extension.typedDataChainID = evmChainId.toString();
     if (feePayer) {
         web3Extension.feePayer = feePayer;
     }

package/dist/cjs/utils/grpc.d.ts

@@ -1,4 +1,4 @@
 import * as grpcPkg from '@injectivelabs/grpc-web';
 declare const grpc: typeof grpcPkg.grpc;
-export declare const getGrpcTransport: () => import("@injectivelabs/grpc-web").grpc.TransportFactory;
+export declare const getGrpcTransport: () => grpcPkg.grpc.TransportFactory;
 export { grpc, grpcPkg };

package/dist/cjs/utils/pagination.d.ts

@@ -19,4 +19,4 @@ export declare const fetchAllWithPagination: <T extends {
     pagination: PaginationOption | undefined;
 } | PaginationOption | undefined, Q extends {
     pagination: Pagination;
-}>(args: T, method: (args: T) => Promise<Q>) => Promise<Q>;
+}>(args: T, method: (args: T) => Promise<Q>, result?: Array<unknown>) => Promise<Q>;

package/dist/cjs/utils/pagination.js

@@ -97,24 +97,17 @@ const grpcPagingToPaging = (pagination) => {
     };
 };
 exports.grpcPagingToPaging = grpcPagingToPaging;
-const fetchAllWithPagination = async (args, method) => {
-    let result = [];
+const fetchAllWithPagination = async (args, method, result = []) => {
     let response = await method(args);
     if (!args) {
         return response;
     }
-    const paginationOption = args.pagination;
-    if (!paginationOption) {
-        return response;
-    }
     const keys = Object.keys(response);
     const valueKey = keys.find((key) => key !== 'pagination');
-    while (response.pagination.next) {
-        result.push(response[valueKey]);
-        response = await method({
-            ...args,
-            pagination: { ...paginationOption, key: response.pagination.next },
-        });
+    result.push(...response[valueKey]);
+    const paginationOption = args;
+    if (response.pagination.next) {
+        return (0, exports.fetchAllWithPagination)({ ...paginationOption, key: response.pagination.next }, method, result);
     }
     return { [valueKey]: result, pagination: response.pagination };
 };

package/dist/esm/client/indexer/grpc/IndexerGrpcTransactionApi.d.ts

@@ -1,10 +1,10 @@
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 import { InjectiveExchangeRpc } from '@injectivelabs/indexer-proto-ts';
 import { CosmosTxV1Beta1Tx } from '@injectivelabs/core-proto-ts';
 import BaseGrpcConsumer from '../../base/BaseIndexerGrpcConsumer.js';
 interface PrepareTxArgs {
     address: AccountAddress;
-    chainId: EthereumChainId;
+    chainId: EvmChainId;
     message: any;
     estimateGas?: boolean;
     gasLimit?: number;
@@ -41,7 +41,7 @@ export declare class IndexerGrpcTransactionApi extends BaseGrpcConsumer {
      */
     broadcastTxRequest({ signature, chainId, message, txResponse, }: {
         signature: string;
-        chainId: EthereumChainId;
+        chainId: EvmChainId;
         useCorrectEIP712Hash?: boolean;
         txResponse: InjectiveExchangeRpc.PrepareTxResponse;
         message: Record<string, any>;

package/dist/esm/client/indexer/grpc/IndexerGrpcWeb3GwApi.d.ts

@@ -1,4 +1,4 @@
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 import { InjectiveExchangeRpc } from '@injectivelabs/indexer-proto-ts';
 import { IndexerGrpcTransactionApi } from './IndexerGrpcTransactionApi.js';
 /**
@@ -9,7 +9,7 @@ export declare class IndexerGrpcWeb3GwApi extends IndexerGrpcTransactionApi {
     constructor(endpoint: string);
     prepareEip712Request({ address, chainId, message, memo, sequence, accountNumber, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, eip712Version, }: {
         address: AccountAddress;
-        chainId: EthereumChainId;
+        chainId: EvmChainId;
         message: any;
         estimateGas?: boolean;
         gasLimit?: number;

package/dist/esm/core/accounts/PrivateKey.d.ts

@@ -1,6 +1,6 @@
-import { PublicKey } from './PublicKey.js';
-import { Address } from './Address.js';
 import { CosmosTxV1Beta1Tx } from '@injectivelabs/core-proto-ts';
+import { Address } from './Address.js';
+import { PublicKey } from './PublicKey.js';
 /**
  * Class for wrapping SigningKey that is used for signature creation and public key derivation.
  *

package/dist/esm/core/accounts/PrivateKey.js

@@ -1,16 +1,16 @@
-import { generateMnemonic } from 'bip39';
-import { Wallet, HDNodeWallet, Signature, getBytes, concat } from 'ethers';
 import secp256k1 from 'secp256k1';
 import keccak256 from 'keccak256';
-import { PublicKey } from './PublicKey.js';
-import { Address } from './Address.js';
+import { generateMnemonic } from 'bip39';
+import { InjectiveTypesV1Beta1TxExt, } from '@injectivelabs/core-proto-ts';
+import { GeneralException } from '@injectivelabs/exceptions';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
+import { Wallet, HDNodeWallet, Signature, getBytes, concat } from 'ethers';
 import { signTypedData, SignTypedDataVersion } from '@metamask/eth-sig-util';
 import { DEFAULT_DERIVATION_PATH, recoverTypedSignaturePubKey, } from '../../utils/index.js';
-import { InjectiveTypesV1Beta1TxExt, } from '@injectivelabs/core-proto-ts';
+import { Address } from './Address.js';
+import { PublicKey } from './PublicKey.js';
 import { getTransactionPartsFromTxRaw } from '../tx/utils/tx.js';
 import { getEip712TypedData, MsgDecoder } from '../tx/eip712/index.js';
-import { GeneralException } from '@injectivelabs/exceptions';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
 /**
  * Class for wrapping SigningKey that is used for signature creation and public key derivation.
  *
@@ -260,31 +260,31 @@ export class PrivateKey {
         const getChainIds = () => {
             if (!body.extensionOptions.length) {
                 return {
-                    ethereumChainId: EthereumChainId.Mainnet,
                     chainId: ChainId.Mainnet,
+                    EvmChainId: EvmChainId.Mainnet,
                 };
             }
             const extension = body.extensionOptions.find((extension) => extension.typeUrl.includes('ExtensionOptionsWeb3Tx'));
             if (!extension) {
                 return {
-                    ethereumChainId: EthereumChainId.Mainnet,
                     chainId: ChainId.Mainnet,
+                    EvmChainId: EvmChainId.Mainnet,
                 };
             }
             const decodedExtension = InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx.decode(extension.value);
-            const ethereumChainId = Number(decodedExtension.typedDataChainID);
+            const evmChainId = Number(decodedExtension.typedDataChainID);
             return {
-                ethereumChainId: ethereumChainId,
+                evmChainId: EvmChainId,
                 chainId: [
-                    EthereumChainId.Goerli,
-                    EthereumChainId.Kovan,
-                    EthereumChainId.Sepolia,
-                ].includes(ethereumChainId)
+                    EvmChainId.Kovan,
+                    EvmChainId.Goerli,
+                    EvmChainId.Sepolia,
+                ].includes(evmChainId)
                     ? ChainId.Testnet
                     : ChainId.Mainnet,
             };
         };
-        const { ethereumChainId, chainId } = getChainIds();
+        const { evmChainId, chainId } = getChainIds();
         const [signerInfo] = authInfo.signerInfos;
         const [signature] = signatures;
         const [msg] = body.messages;
@@ -299,7 +299,7 @@ export class PrivateKey {
                 timeoutHeight: body.timeoutHeight.toString(),
                 chainId,
             },
-            ethereumChainId,
+            evmChainId: evmChainId,
         });
         return this.verifySignature({
             eip712: eip712TypedData,

package/dist/esm/core/modules/wasm/msgs/MsgExecuteContract.d.ts

@@ -53,6 +53,7 @@ export default class MsgExecuteContract extends MsgBase<MsgExecuteContract.Param
         msg: any;
         '@type': string;
     };
+    toEip712(): never;
     toDirectSign(): {
         type: string;
         message: CosmwasmWasmV1Tx.MsgExecuteContract;

package/dist/esm/core/modules/wasm/msgs/MsgExecuteContract.js

@@ -57,13 +57,9 @@ export default class MsgExecuteContract extends MsgBase {
             ...value,
         };
     }
-    // public toEip712(): never {
-    //   throw new GeneralException(
-    //     new Error(
-    //       'EIP712_v1 is not supported for MsgExecuteContract. Please use EIP712_v2',
-    //     ),
-    //   )
-    // }
+    toEip712() {
+        throw new GeneralException(new Error('EIP712_v1 is not supported for MsgExecuteContract. Please use EIP712_v2'));
+    }
     toDirectSign() {
         const proto = this.toProto();
         return {

package/dist/esm/core/tx/broadcaster/MsgBroadcasterWithPk.d.ts

@@ -1,6 +1,6 @@
 import { PrivateKey } from '../../accounts/index.js';
 import { Msgs } from '../../modules/msgs.js';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { Network, NetworkEndpoints } from '@injectivelabs/networks';
 import { AccountDetails } from '../../../types/auth.js';
 interface MsgBroadcasterTxOptions {
@@ -25,7 +25,7 @@ interface MsgBroadcasterWithPkOptions {
         rest: string;
     };
     privateKey: string | PrivateKey;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     chainId?: ChainId;
     simulateTx?: boolean;
     loggingEnabled?: boolean;
@@ -45,7 +45,7 @@ interface MsgBroadcasterWithPkOptions {
 export declare class MsgBroadcasterWithPk {
     endpoints: NetworkEndpoints;
     chainId: ChainId;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     privateKey: PrivateKey;
     simulateTx: boolean;
     txTimeoutOnFeeDelegation: boolean;

package/dist/esm/core/tx/broadcaster/MsgBroadcasterWithPk.js

@@ -20,7 +20,7 @@ import { ofacWallets } from '../../../json/index.js';
 export class MsgBroadcasterWithPk {
     endpoints;
     chainId;
-    ethereumChainId;
+    evmChainId;
     privateKey;
     simulateTx = false;
     txTimeoutOnFeeDelegation = false;
@@ -36,8 +36,7 @@ export class MsgBroadcasterWithPk {
         this.simulateTx = options.simulateTx || false;
         this.chainId = options.chainId || networkInfo.chainId;
         this.txTimeout = options.txTimeout || DEFAULT_BLOCK_TIMEOUT_HEIGHT;
-        this.ethereumChainId =
-            options.ethereumChainId || networkInfo.ethereumChainId;
+        this.evmChainId = options.evmChainId || networkInfo.evmChainId;
         this.endpoints = { ...endpoints, ...(options.endpoints || {}) };
         this.privateKey =
             options.privateKey instanceof PrivateKey
@@ -67,7 +66,7 @@ export class MsgBroadcasterWithPk {
      * @returns {string} transaction hash
      */
     async broadcastWithFeeDelegation(transaction) {
-        const { simulateTx, privateKey, ethereumChainId, endpoints, txTimeoutOnFeeDelegation, txTimeout, } = this;
+        const { endpoints, txTimeout, simulateTx, privateKey, evmChainId, txTimeoutOnFeeDelegation, } = this;
         const ethereumWallet = this.privateKey.toHex();
         if (ofacWallets.includes(ethereumWallet)) {
             throw new GeneralException(new Error('You cannot execute this transaction'));
@@ -81,7 +80,7 @@ export class MsgBroadcasterWithPk {
             ethereumAddress: ethereumWallet,
         };
         const web3Msgs = msgs.map((msg) => msg.toWeb3());
-        if (!ethereumChainId) {
+        if (!evmChainId) {
             throw new GeneralException(new Error('Please provide ethereumChainId'));
         }
         let timeoutHeight = undefined;
@@ -97,7 +96,7 @@ export class MsgBroadcasterWithPk {
             memo: tx.memo,
             message: web3Msgs,
             address: tx.ethereumAddress,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
             gasLimit: getGasPriceBasedOnMessage(msgs),
             estimateGas: simulateTx || false,
             timeoutHeight,
@@ -106,7 +105,7 @@ export class MsgBroadcasterWithPk {
         const response = await transactionApi.broadcastTxRequest({
             txResponse,
             message: web3Msgs,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
             signature: `0x${Buffer.from(signature).toString('hex')}`,
         });
         return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);

package/dist/esm/core/tx/eip712/eip712.d.ts

@@ -1,11 +1,11 @@
 import { Msgs } from '../../modules/msgs.js';
-import { EthereumChainId } from '@injectivelabs/ts-types';
+import { EvmChainId } from '@injectivelabs/ts-types';
 import { Eip712ConvertFeeArgs, Eip712ConvertTxArgs } from './types.js';
-export declare const getEip712TypedData: ({ msgs, tx, fee, ethereumChainId, }: {
+export declare const getEip712TypedData: ({ msgs, tx, fee, evmChainId, }: {
     msgs: Msgs | Msgs[];
     tx: Eip712ConvertTxArgs;
     fee?: Eip712ConvertFeeArgs;
-    ethereumChainId: EthereumChainId;
+    evmChainId: EvmChainId;
 }) => {
     message: {
         msgs: {
@@ -57,11 +57,11 @@ export declare const getEip712TypedData: ({ msgs, tx, fee, ethereumChainId, }: {
         }[];
     };
 };
-export declare const getEip712TypedDataV2: ({ msgs, tx, fee, ethereumChainId, }: {
+export declare const getEip712TypedDataV2: ({ msgs, tx, fee, evmChainId, }: {
     msgs: Msgs | Msgs[];
     tx: Eip712ConvertTxArgs;
     fee?: Eip712ConvertFeeArgs;
-    ethereumChainId: EthereumChainId;
+    evmChainId: EvmChainId;
 }) => {
     message: {
         context: string;

package/dist/esm/core/tx/eip712/eip712.js

@@ -1,6 +1,6 @@
-import { getEip712Fee, getEipTxDetails, getEip712Domain, getEip712DomainV2, getDefaultEip712Types, getTypesIncludingFeePayer, getDefaultEip712TypesV2, } from './utils.js';
+import { getEip712Fee, getEipTxDetails, getEip712Domain, getEip712DomainV2, getDefaultEip712Types, getDefaultEip712TypesV2, getTypesIncludingFeePayer, } from './utils.js';
 import { getEipTxContext } from './utils.js';
-export const getEip712TypedData = ({ msgs, tx, fee, ethereumChainId, }) => {
+export const getEip712TypedData = ({ msgs, tx, fee, evmChainId, }) => {
     const messages = Array.isArray(msgs) ? msgs : [msgs];
     const eip712Msgs = messages.map((m) => m.toEip712());
     const eip712MessageTypes = messages[0].toEip712Types();
@@ -18,7 +18,7 @@ export const getEip712TypedData = ({ msgs, tx, fee, ethereumChainId, }) => {
     return {
         ...typesWithFeePayer,
         primaryType: 'Tx',
-        ...getEip712Domain(ethereumChainId),
+        ...getEip712Domain(evmChainId),
         message: {
             ...getEipTxDetails(tx),
             ...getEip712Fee(fee),
@@ -26,14 +26,14 @@ export const getEip712TypedData = ({ msgs, tx, fee, ethereumChainId, }) => {
         },
     };
 };
-export const getEip712TypedDataV2 = ({ msgs, tx, fee, ethereumChainId, }) => {
+export const getEip712TypedDataV2 = ({ msgs, tx, fee, evmChainId, }) => {
     const messages = Array.isArray(msgs) ? msgs : [msgs];
     const eip712Msgs = messages.map((m) => m.toEip712V2());
     const types = getDefaultEip712TypesV2();
     return {
         ...types,
         primaryType: 'Tx',
-        ...getEip712DomainV2(ethereumChainId),
+        ...getEip712DomainV2(evmChainId),
         message: {
             context: JSON.stringify(getEipTxContext({ ...tx, fee })),
             msgs: JSON.stringify(eip712Msgs),

package/dist/esm/core/tx/eip712/utils.d.ts

@@ -1,6 +1,6 @@
-import { EthereumChainId } from '@injectivelabs/ts-types';
+import { EvmChainId } from '@injectivelabs/ts-types';
 import { Eip712ConvertFeeArgs, Eip712ConvertTxArgs } from './types.js';
-export declare const getEip712Domain: (ethereumChainId: EthereumChainId) => {
+export declare const getEip712Domain: (evmChainId: EvmChainId) => {
     domain: {
         name: string;
         version: string;
@@ -9,7 +9,7 @@ export declare const getEip712Domain: (ethereumChainId: EthereumChainId) => {
         verifyingContract: string;
     };
 };
-export declare const getEip712DomainV2: (ethereumChainId: EthereumChainId) => {
+export declare const getEip712DomainV2: (evmChainId: EvmChainId) => {
     domain: {
         name: string;
         version: string;

package/dist/esm/core/tx/eip712/utils.js

@@ -1,21 +1,21 @@
 import { BigNumberInBase, DEFAULT_GAS_LIMIT, DEFAULT_STD_FEE, } from '@injectivelabs/utils';
-export const getEip712Domain = (ethereumChainId) => {
+export const getEip712Domain = (evmChainId) => {
     return {
         domain: {
             name: 'Injective Web3',
             version: '1.0.0',
-            chainId: '0x' + new BigNumberInBase(ethereumChainId).toString(16),
+            chainId: '0x' + new BigNumberInBase(evmChainId).toString(16),
             salt: '0',
             verifyingContract: 'cosmos',
         },
     };
 };
-export const getEip712DomainV2 = (ethereumChainId) => {
+export const getEip712DomainV2 = (evmChainId) => {
     return {
         domain: {
             name: 'Injective Web3',
             version: '1.0.0',
-            chainId: '0x' + new BigNumberInBase(ethereumChainId).toString(16),
+            chainId: '0x' + new BigNumberInBase(evmChainId).toString(16),
             verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
             salt: '0',
         },

package/dist/esm/core/tx/utils/tx.d.ts

@@ -1,4 +1,4 @@
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { Msgs } from '../../modules/msgs.js';
 import { GoogleProtobufAny, CosmosTxV1Beta1Tx, InjectiveTypesV1Beta1TxExt, CosmosTxSigningV1Beta1Signing } from '@injectivelabs/core-proto-ts';
 export declare const getPublicKey: ({ chainId, key, }: {
@@ -49,8 +49,8 @@ export declare const createSignDocFromTransaction: (args: {
     accountNumber: number;
 }) => CosmosTxV1Beta1Tx.SignDoc;
 export declare const createTxRawEIP712: (txRaw: CosmosTxV1Beta1Tx.TxRaw, extension: InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx, nonCriticalExtension?: GoogleProtobufAny.Any | GoogleProtobufAny.Any[]) => CosmosTxV1Beta1Tx.TxRaw;
-export declare const createWeb3Extension: ({ ethereumChainId, feePayer, feePayerSig, }: {
-    ethereumChainId: EthereumChainId;
+export declare const createWeb3Extension: ({ evmChainId, feePayer, feePayerSig, }: {
+    evmChainId: EvmChainId;
     feePayer?: string;
     feePayerSig?: Uint8Array;
 }) => InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx;

package/dist/esm/core/tx/utils/tx.js

@@ -108,9 +108,9 @@ export const createTxRawEIP712 = (txRaw, extension, nonCriticalExtension) => {
     txRaw.bodyBytes = CosmosTxV1Beta1Tx.TxBody.encode(body).finish();
     return txRaw;
 };
-export const createWeb3Extension = ({ ethereumChainId, feePayer, feePayerSig, }) => {
+export const createWeb3Extension = ({ evmChainId, feePayer, feePayerSig, }) => {
     const web3Extension = InjectiveTypesV1Beta1TxExt.ExtensionOptionsWeb3Tx.create();
-    web3Extension.typedDataChainID = ethereumChainId.toString();
+    web3Extension.typedDataChainID = evmChainId.toString();
     if (feePayer) {
         web3Extension.feePayer = feePayer;
     }

package/dist/esm/utils/grpc.d.ts

@@ -1,4 +1,4 @@
 import * as grpcPkg from '@injectivelabs/grpc-web';
 declare const grpc: typeof grpcPkg.grpc;
-export declare const getGrpcTransport: () => import("@injectivelabs/grpc-web").grpc.TransportFactory;
+export declare const getGrpcTransport: () => grpcPkg.grpc.TransportFactory;
 export { grpc, grpcPkg };

package/dist/esm/utils/pagination.d.ts

@@ -19,4 +19,4 @@ export declare const fetchAllWithPagination: <T extends {
     pagination: PaginationOption | undefined;
 } | PaginationOption | undefined, Q extends {
     pagination: Pagination;
-}>(args: T, method: (args: T) => Promise<Q>) => Promise<Q>;
+}>(args: T, method: (args: T) => Promise<Q>, result?: Array<unknown>) => Promise<Q>;

package/dist/esm/utils/pagination.js

@@ -88,24 +88,17 @@ export const grpcPagingToPaging = (pagination) => {
         total: parseInt(pagination.total || '0', 10),
     };
 };
-export const fetchAllWithPagination = async (args, method) => {
-    let result = [];
+export const fetchAllWithPagination = async (args, method, result = []) => {
     let response = await method(args);
     if (!args) {
         return response;
     }
-    const paginationOption = args.pagination;
-    if (!paginationOption) {
-        return response;
-    }
     const keys = Object.keys(response);
     const valueKey = keys.find((key) => key !== 'pagination');
-    while (response.pagination.next) {
-        result.push(response[valueKey]);
-        response = await method({
-            ...args,
-            pagination: { ...paginationOption, key: response.pagination.next },
-        });
+    result.push(...response[valueKey]);
+    const paginationOption = args;
+    if (response.pagination.next) {
+        return fetchAllWithPagination({ ...paginationOption, key: response.pagination.next }, method, result);
     }
     return { [valueKey]: result, pagination: response.pagination };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/sdk-ts",
   "description": "SDK in TypeScript for building Injective applications in a browser, node, and react native environment.",
-  "version": "1.16.5",
+  "version": "1.16.6-alpha.0",
   "sideEffects": false,
   "license": "Apache-2.0",
   "author": {
@@ -102,10 +102,10 @@
   },
   "scripts": {
     "fetch:ofac": "node --experimental-fetch ./../../etc/ofac.js",
-    "build": "yarn build:cjs && yarn build:esm && yarn build:post",
+    "build": "pnpm build:cjs && pnpm build:esm && pnpm build:post",
     "build:cjs": "tsc --build --force tsconfig.build.json",
     "build:esm": "tsc --build --force tsconfig.build.esm.json",
-    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && yarn build:post",
+    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && pnpm build:post",
     "build:post": "shx cp ../../etc/stub/package.json.stub dist/cjs/package.json && shx cp ../../etc/stub/package.esm.json.stub dist/esm/package.json",
     "clean": "tsc --build tsconfig.build.json --clean && tsc --build tsconfig.build.esm.json --clean && shx rm -rf coverage *.log junit.xml dist && jest --clearCache && shx mkdir -p dist",
     "test": "jest",
@@ -123,16 +123,16 @@
     "@cosmjs/stargate": "^0.33.0",
     "@injectivelabs/abacus-proto-ts": "1.14.0",
     "@injectivelabs/core-proto-ts": "1.16.1",
-    "@injectivelabs/exceptions": "^1.16.5",
+    "@injectivelabs/exceptions": "1.16.6-alpha.0",
     "@injectivelabs/grpc-web": "^0.0.1",
     "@injectivelabs/grpc-web-node-http-transport": "^0.0.2",
     "@injectivelabs/grpc-web-react-native-transport": "^0.0.2",
     "@injectivelabs/indexer-proto-ts": "1.13.14",
     "@injectivelabs/mito-proto-ts": "1.13.2",
-    "@injectivelabs/networks": "^1.16.5",
+    "@injectivelabs/networks": "1.16.6-alpha.0",
     "@injectivelabs/olp-proto-ts": "1.13.4",
-    "@injectivelabs/ts-types": "^1.16.5",
-    "@injectivelabs/utils": "^1.16.5",
+    "@injectivelabs/ts-types": "1.16.6-alpha.0",
+    "@injectivelabs/utils": "1.16.6-alpha.0",
     "@metamask/eth-sig-util": "^8.2.0",
     "@noble/curves": "^1.8.1",
     "@noble/hashes": "^1.7.1",
@@ -147,21 +147,17 @@
     "graphql": "^16.10.0",
     "http-status-codes": "^2.2.0",
     "keccak256": "^1.0.6",
+    "rxjs": "7.8.2",
     "secp256k1": "^4.0.3",
     "shx": "^0.3.4",
     "snakecase-keys": "^5.4.1"
   },
-  "gitHead": "59378cbaf7f09e97bd0c8c157fd03abdd0ea35d5",
+  "gitHead": "b2bd329705e0848283332658754771d45c09d4f7",
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "readmeFile": "./README.md",
     "displayName": "sdk-ts API documentation"
   },
-  "resolutions": {
-    "@ethereumjs/tx": "^4.1.1",
-    "**/libsodium": "npm:@bangjelkoski/noop",
-    "**/libsodium-wrappers": "npm:@bangjelkoski/noop"
-  },
   "devDependencies": {
     "@types/crypto-js": "^4.2.2",
     "@types/lodash.toarray": "^4.4.7"