@injectivelabs/wallet-ledger 1.15.30 → 1.15.32

package/dist/cjs/strategy/Ledger/Base.d.ts

@@ -16,7 +16,7 @@ export default class LedgerBase extends BaseConcreteStrategy implements Concrete
     disconnect(): Promise<void>;
     getAddresses(): Promise<string[]>;
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
-    sendEthereumTransaction(txData: any, options: {
+    sendEvmTransaction(txData: any, args: {
         address: string;
         ethereumChainId: EthereumChainId;
     }): Promise<string>;
@@ -34,9 +34,9 @@ export default class LedgerBase extends BaseConcreteStrategy implements Concrete
     }): Promise<DirectSignResponse>;
     signArbitrary(signer: AccountAddress, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEthereumTransactionReceipt(txHash: string): Promise<string>;
+    getEvmTransactionReceipt(txHash: string): Promise<string>;
     getPubKey(): Promise<string>;
-    private signEthereumTransaction;
+    private signEvmTransaction;
     private getWalletForAddress;
     private getAlchemy;
 }

package/dist/cjs/strategy/Ledger/Base.js

@@ -67,10 +67,10 @@ class LedgerBase extends wallet_base_1.BaseConcreteStrategy {
     async getSessionOrConfirm(address) {
         return Promise.resolve(`0x${Buffer.from(`Confirmation for ${address} at time: ${Date.now()}`).toString('hex')}`);
     }
-    async sendEthereumTransaction(txData, options) {
-        const signedTransaction = await this.signEthereumTransaction(txData, options);
+    async sendEvmTransaction(txData, args) {
+        const signedTransaction = await this.signEvmTransaction(txData, args);
         try {
-            const alchemy = await this.getAlchemy();
+            const alchemy = await this.getAlchemy(args.ethereumChainId);
             const txReceipt = await alchemy.core.sendTransaction((0, ethereumjs_util_1.addHexPrefix)(signedTransaction.serialize().toString('hex')));
             return txReceipt.hash;
         }
@@ -78,7 +78,7 @@ class LedgerBase extends wallet_base_1.BaseConcreteStrategy {
             throw new exceptions_1.LedgerException(new Error(e.message), {
                 code: exceptions_1.UnspecifiedErrorCode,
                 type: exceptions_1.ErrorType.WalletError,
-                contextModule: wallet_base_1.WalletAction.SendEthereumTransaction,
+                contextModule: wallet_base_1.WalletAction.SendEvmTransaction,
             });
         }
     }
@@ -171,17 +171,17 @@ class LedgerBase extends wallet_base_1.BaseConcreteStrategy {
         const alchemyProvider = await alchemy.config.getProvider();
         return alchemyProvider.network.chainId.toString();
     }
-    async getEthereumTransactionReceipt(txHash) {
+    async getEvmTransactionReceipt(txHash) {
         return Promise.resolve(txHash);
     }
     // eslint-disable-next-line class-methods-use-this
     async getPubKey() {
         throw new exceptions_1.WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
     }
-    async signEthereumTransaction(txData, options) {
-        const alchemy = await this.getAlchemy();
-        const chainId = parseInt(options.ethereumChainId.toString(), 10);
-        const nonce = await alchemy.core.getTransactionCount(options.address);
+    async signEvmTransaction(txData, args) {
+        const alchemy = await this.getAlchemy(args.ethereumChainId);
+        const chainId = parseInt(args.ethereumChainId.toString(), 10);
+        const nonce = await alchemy.core.getTransactionCount(args.address);
         const common = new common_1.Common({
             chain: getNetworkFromChainId(chainId),
             hardfork: common_1.Hardfork.London,
@@ -202,7 +202,7 @@ class LedgerBase extends wallet_base_1.BaseConcreteStrategy {
         const encodedMessageHex = msg.toString('hex');
         try {
             const ledger = await this.ledger.getInstance();
-            const { derivationPath } = await this.getWalletForAddress(options.address);
+            const { derivationPath } = await this.getWalletForAddress(args.address);
             const resolution = await ledgerhq_hw_app_eth_1.ledgerService.resolveTransaction(encodedMessageHex, {}, {});
             const txSig = await ledger.signTransaction(derivationPath, encodedMessageHex, resolution);
             const signedTxData = {
@@ -219,7 +219,7 @@ class LedgerBase extends wallet_base_1.BaseConcreteStrategy {
             throw new exceptions_1.LedgerException(new Error(e.message), {
                 code: exceptions_1.UnspecifiedErrorCode,
                 type: exceptions_1.ErrorType.WalletError,
-                contextModule: wallet_base_1.WalletAction.SignEthereumTransaction,
+                contextModule: wallet_base_1.WalletAction.SignEvmTransaction,
             });
         }
     }
@@ -245,17 +245,19 @@ class LedgerBase extends wallet_base_1.BaseConcreteStrategy {
             });
         }
     }
-    async getAlchemy() {
+    async getAlchemy(ethereumChainId) {
         if (this.alchemy) {
             return this.alchemy;
         }
-        const { rpcUrl, ethereumChainId } = this.ethereumOptions;
-        if (!rpcUrl) {
+        const options = this.ethereumOptions;
+        const chainId = ethereumChainId || options.ethereumChainId;
+        const url = options.rpcUrl || options.rpcUrls?.[chainId];
+        if (!url) {
             throw new exceptions_1.GeneralException(new Error('Please pass rpcUrl within the ethereumOptions'));
         }
         this.alchemy = new alchemy_sdk_1.Alchemy({
-            apiKey: (0, wallet_base_1.getKeyFromRpcUrl)(rpcUrl),
-            network: ethereumChainId === ts_types_1.EthereumChainId.Mainnet
+            apiKey: (0, wallet_base_1.getKeyFromRpcUrl)(url),
+            network: chainId === ts_types_1.EthereumChainId.Mainnet
                 ? alchemy_sdk_1.Network.ETH_MAINNET
                 : alchemy_sdk_1.Network.ETH_SEPOLIA,
         });

package/dist/cjs/strategy/LedgerCosmos/index.d.ts

@@ -12,7 +12,7 @@ export declare class LedgerCosmos extends BaseConcreteStrategy implements Concre
     disconnect(): Promise<void>;
     getAddresses(): Promise<string[]>;
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
-    sendEthereumTransaction(_txData: any, _options: {
+    sendEvmTransaction(_txData: any, _options: {
         address: string;
         ethereumChainId: EthereumChainId;
     }): Promise<string>;
@@ -30,7 +30,7 @@ export declare class LedgerCosmos extends BaseConcreteStrategy implements Concre
     signEip712TypedData(_eip712Json: string, _address: AccountAddress): Promise<string>;
     signArbitrary(signer: AccountAddress, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEthereumTransactionReceipt(_txHash: string): Promise<string>;
+    getEvmTransactionReceipt(_txHash: string): Promise<string>;
     getPubKey(address?: string): Promise<string>;
     private getWalletForAddress;
 }

package/dist/cjs/strategy/LedgerCosmos/index.js

@@ -44,10 +44,10 @@ class LedgerCosmos extends wallet_base_1.BaseConcreteStrategy {
     async getSessionOrConfirm(address) {
         return Promise.resolve(`0x${Buffer.from(`Confirmation for ${address} at time: ${Date.now()}`).toString('hex')}`);
     }
-    async sendEthereumTransaction(_txData, _options) {
-        throw new exceptions_2.CosmosWalletException(new Error('sendEthereumTransaction is not supported. LedgerCosmos only supports sending cosmos transactions'), {
+    async sendEvmTransaction(_txData, _options) {
+        throw new exceptions_2.CosmosWalletException(new Error('sendEvmTransaction is not supported. LedgerCosmos only supports sending cosmos transactions'), {
             code: exceptions_1.UnspecifiedErrorCode,
-            context: wallet_base_1.WalletAction.SendEthereumTransaction,
+            context: wallet_base_1.WalletAction.SendEvmTransaction,
         });
     }
     async sendTransaction(transaction, options) {
@@ -120,10 +120,10 @@ class LedgerCosmos extends wallet_base_1.BaseConcreteStrategy {
             context: wallet_base_1.WalletAction.GetChainId,
         });
     }
-    async getEthereumTransactionReceipt(_txHash) {
-        throw new exceptions_2.CosmosWalletException(new Error('getEthereumTransactionReceipt is not supported on Keplr'), {
+    async getEvmTransactionReceipt(_txHash) {
+        throw new exceptions_2.CosmosWalletException(new Error('getEvmTransactionReceipt is not supported on Keplr'), {
             code: exceptions_1.UnspecifiedErrorCode,
-            context: wallet_base_1.WalletAction.GetEthereumTransactionReceipt,
+            context: wallet_base_1.WalletAction.GetEvmTransactionReceipt,
         });
     }
     async getPubKey(address) {

package/dist/esm/strategy/Ledger/Base.d.ts

@@ -16,7 +16,7 @@ export default class LedgerBase extends BaseConcreteStrategy implements Concrete
     disconnect(): Promise<void>;
     getAddresses(): Promise<string[]>;
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
-    sendEthereumTransaction(txData: any, options: {
+    sendEvmTransaction(txData: any, args: {
         address: string;
         ethereumChainId: EthereumChainId;
     }): Promise<string>;
@@ -34,9 +34,9 @@ export default class LedgerBase extends BaseConcreteStrategy implements Concrete
     }): Promise<DirectSignResponse>;
     signArbitrary(signer: AccountAddress, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEthereumTransactionReceipt(txHash: string): Promise<string>;
+    getEvmTransactionReceipt(txHash: string): Promise<string>;
     getPubKey(): Promise<string>;
-    private signEthereumTransaction;
+    private signEvmTransaction;
     private getWalletForAddress;
     private getAlchemy;
 }

package/dist/esm/strategy/Ledger/Base.js

@@ -4,9 +4,9 @@ import { bufferToHex, addHexPrefix } from 'ethereumjs-util';
 import { Common, Chain, Hardfork } from '@ethereumjs/common';
 import { FeeMarketEIP1559Transaction } from '@ethereumjs/tx';
 import { ledgerService } from '@bangjelkoski/ledgerhq-hw-app-eth';
-import { ErrorType, GeneralException, LedgerException, TransactionException, UnspecifiedErrorCode, WalletException, } from '@injectivelabs/exceptions';
+import { ErrorType, LedgerException, WalletException, GeneralException, UnspecifiedErrorCode, TransactionException, } from '@injectivelabs/exceptions';
 import { toUtf8, TxGrpcApi, } from '@injectivelabs/sdk-ts';
-import { TIP_IN_GWEI, WalletAction, WalletDeviceType, getKeyFromRpcUrl, BaseConcreteStrategy, DEFAULT_BASE_DERIVATION_PATH, DEFAULT_ADDRESS_SEARCH_LIMIT, DEFAULT_NUM_ADDRESSES_TO_FETCH, } from '@injectivelabs/wallet-base';
+import { TIP_IN_GWEI, WalletAction, getKeyFromRpcUrl, WalletDeviceType, BaseConcreteStrategy, DEFAULT_BASE_DERIVATION_PATH, DEFAULT_ADDRESS_SEARCH_LIMIT, DEFAULT_NUM_ADDRESSES_TO_FETCH, } from '@injectivelabs/wallet-base';
 import LedgerHW from './hw/index.js';
 import { domainHash, messageHash } from './utils.js';
 import { Alchemy, Network as AlchemyNetwork } from 'alchemy-sdk';
@@ -62,10 +62,10 @@ export default class LedgerBase extends BaseConcreteStrategy {
     async getSessionOrConfirm(address) {
         return Promise.resolve(`0x${Buffer.from(`Confirmation for ${address} at time: ${Date.now()}`).toString('hex')}`);
     }
-    async sendEthereumTransaction(txData, options) {
-        const signedTransaction = await this.signEthereumTransaction(txData, options);
+    async sendEvmTransaction(txData, args) {
+        const signedTransaction = await this.signEvmTransaction(txData, args);
         try {
-            const alchemy = await this.getAlchemy();
+            const alchemy = await this.getAlchemy(args.ethereumChainId);
             const txReceipt = await alchemy.core.sendTransaction(addHexPrefix(signedTransaction.serialize().toString('hex')));
             return txReceipt.hash;
         }
@@ -73,7 +73,7 @@ export default class LedgerBase extends BaseConcreteStrategy {
             throw new LedgerException(new Error(e.message), {
                 code: UnspecifiedErrorCode,
                 type: ErrorType.WalletError,
-                contextModule: WalletAction.SendEthereumTransaction,
+                contextModule: WalletAction.SendEvmTransaction,
             });
         }
     }
@@ -166,17 +166,17 @@ export default class LedgerBase extends BaseConcreteStrategy {
         const alchemyProvider = await alchemy.config.getProvider();
         return alchemyProvider.network.chainId.toString();
     }
-    async getEthereumTransactionReceipt(txHash) {
+    async getEvmTransactionReceipt(txHash) {
         return Promise.resolve(txHash);
     }
     // eslint-disable-next-line class-methods-use-this
     async getPubKey() {
         throw new WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
     }
-    async signEthereumTransaction(txData, options) {
-        const alchemy = await this.getAlchemy();
-        const chainId = parseInt(options.ethereumChainId.toString(), 10);
-        const nonce = await alchemy.core.getTransactionCount(options.address);
+    async signEvmTransaction(txData, args) {
+        const alchemy = await this.getAlchemy(args.ethereumChainId);
+        const chainId = parseInt(args.ethereumChainId.toString(), 10);
+        const nonce = await alchemy.core.getTransactionCount(args.address);
         const common = new Common({
             chain: getNetworkFromChainId(chainId),
             hardfork: Hardfork.London,
@@ -197,7 +197,7 @@ export default class LedgerBase extends BaseConcreteStrategy {
         const encodedMessageHex = msg.toString('hex');
         try {
             const ledger = await this.ledger.getInstance();
-            const { derivationPath } = await this.getWalletForAddress(options.address);
+            const { derivationPath } = await this.getWalletForAddress(args.address);
             const resolution = await ledgerService.resolveTransaction(encodedMessageHex, {}, {});
             const txSig = await ledger.signTransaction(derivationPath, encodedMessageHex, resolution);
             const signedTxData = {
@@ -214,7 +214,7 @@ export default class LedgerBase extends BaseConcreteStrategy {
             throw new LedgerException(new Error(e.message), {
                 code: UnspecifiedErrorCode,
                 type: ErrorType.WalletError,
-                contextModule: WalletAction.SignEthereumTransaction,
+                contextModule: WalletAction.SignEvmTransaction,
             });
         }
     }
@@ -240,17 +240,19 @@ export default class LedgerBase extends BaseConcreteStrategy {
             });
         }
     }
-    async getAlchemy() {
+    async getAlchemy(ethereumChainId) {
         if (this.alchemy) {
             return this.alchemy;
         }
-        const { rpcUrl, ethereumChainId } = this.ethereumOptions;
-        if (!rpcUrl) {
+        const options = this.ethereumOptions;
+        const chainId = ethereumChainId || options.ethereumChainId;
+        const url = options.rpcUrl || options.rpcUrls?.[chainId];
+        if (!url) {
             throw new GeneralException(new Error('Please pass rpcUrl within the ethereumOptions'));
         }
         this.alchemy = new Alchemy({
-            apiKey: getKeyFromRpcUrl(rpcUrl),
-            network: ethereumChainId === EthereumChainId.Mainnet
+            apiKey: getKeyFromRpcUrl(url),
+            network: chainId === EthereumChainId.Mainnet
                 ? AlchemyNetwork.ETH_MAINNET
                 : AlchemyNetwork.ETH_SEPOLIA,
         });

package/dist/esm/strategy/LedgerCosmos/index.d.ts

@@ -12,7 +12,7 @@ export declare class LedgerCosmos extends BaseConcreteStrategy implements Concre
     disconnect(): Promise<void>;
     getAddresses(): Promise<string[]>;
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
-    sendEthereumTransaction(_txData: any, _options: {
+    sendEvmTransaction(_txData: any, _options: {
         address: string;
         ethereumChainId: EthereumChainId;
     }): Promise<string>;
@@ -30,7 +30,7 @@ export declare class LedgerCosmos extends BaseConcreteStrategy implements Concre
     signEip712TypedData(_eip712Json: string, _address: AccountAddress): Promise<string>;
     signArbitrary(signer: AccountAddress, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEthereumTransactionReceipt(_txHash: string): Promise<string>;
+    getEvmTransactionReceipt(_txHash: string): Promise<string>;
     getPubKey(address?: string): Promise<string>;
     private getWalletForAddress;
 }

package/dist/esm/strategy/LedgerCosmos/index.js

@@ -38,10 +38,10 @@ export class LedgerCosmos extends BaseConcreteStrategy {
     async getSessionOrConfirm(address) {
         return Promise.resolve(`0x${Buffer.from(`Confirmation for ${address} at time: ${Date.now()}`).toString('hex')}`);
     }
-    async sendEthereumTransaction(_txData, _options) {
-        throw new CosmosWalletException(new Error('sendEthereumTransaction is not supported. LedgerCosmos only supports sending cosmos transactions'), {
+    async sendEvmTransaction(_txData, _options) {
+        throw new CosmosWalletException(new Error('sendEvmTransaction is not supported. LedgerCosmos only supports sending cosmos transactions'), {
             code: UnspecifiedErrorCode,
-            context: WalletAction.SendEthereumTransaction,
+            context: WalletAction.SendEvmTransaction,
         });
     }
     async sendTransaction(transaction, options) {
@@ -114,10 +114,10 @@ export class LedgerCosmos extends BaseConcreteStrategy {
             context: WalletAction.GetChainId,
         });
     }
-    async getEthereumTransactionReceipt(_txHash) {
-        throw new CosmosWalletException(new Error('getEthereumTransactionReceipt is not supported on Keplr'), {
+    async getEvmTransactionReceipt(_txHash) {
+        throw new CosmosWalletException(new Error('getEvmTransactionReceipt is not supported on Keplr'), {
             code: UnspecifiedErrorCode,
-            context: WalletAction.GetEthereumTransactionReceipt,
+            context: WalletAction.GetEvmTransactionReceipt,
         });
     }
     async getPubKey(address) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-ledger",
   "description": "Ledger wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.15.30",
+  "version": "1.15.32",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -63,10 +63,10 @@
     "@bangjelkoski/ledgerhq-hw-transport-webusb": "6.29.4-beta.0",
     "@ethereumjs/common": "^3.1.1",
     "@ethereumjs/tx": "^4.1.1",
-    "@injectivelabs/exceptions": "^1.15.27",
-    "@injectivelabs/sdk-ts": "^1.15.30",
-    "@injectivelabs/ts-types": "^1.15.28",
-    "@injectivelabs/wallet-base": "^1.15.30",
+    "@injectivelabs/exceptions": "^1.15.29",
+    "@injectivelabs/sdk-ts": "^1.15.32",
+    "@injectivelabs/ts-types": "^1.15.30",
+    "@injectivelabs/wallet-base": "^1.15.32",
     "alchemy-sdk": "^3.4.7",
     "eth-sig-util": "^3.0.1",
     "ethereumjs-util": "^7.1.0",
@@ -78,5 +78,5 @@
     "@types/hdkey": "^2.0.1",
     "@types/ledgerhq__hw-transport-webusb": "^4.70.1"
   },
-  "gitHead": "2c2a365b27e08ad2e0eb06efe3c490c88888fee4"
+  "gitHead": "e8fa12c489c4b3432579c5df30fd6f939d57b442"
 }