@injectivelabs/wallet-ledger 1.19.22 → 1.19.23

package/dist/cjs/index.cjs

@@ -167,6 +167,29 @@ var LedgerTransport$1 = class LedgerTransport$1 {
 
 //#endregion
 //#region src/strategy/Ledger/Eip1193Provider.ts
+const signTypedDataMethods = new Set([
+	"eth_signTypedData",
+	"eth_signTypedData_v3",
+	"eth_signTypedData_v4"
+]);
+const signMessageMethods = new Set(["eth_sign", "personal_sign"]);
+const isEthAddress = (value) => typeof value === "string" && /^0x[a-fA-F0-9]{40}$/.test(value);
+const getTypedDataParam = (method, params) => {
+	const typedData = isEthAddress(params[0]) ? params[1] : params[0];
+	if (typedData == null || typeof typedData === "string" && typedData.length === 0) throw new Error(`Missing typed data parameter for ${method}`);
+	return typeof typedData === "string" ? typedData : JSON.stringify(typedData);
+};
+const getMessageParam = (method, params) => {
+	let message = params[0];
+	if (method === "eth_sign" || isEthAddress(params[0])) message = params[1];
+	if (!(message instanceof Uint8Array) && (typeof message !== "string" || message.length === 0)) throw new Error(`Missing message parameter for ${method}`);
+	return message;
+};
+const getMessageHex = (message) => {
+	if (message instanceof Uint8Array) return (0, viem.toHex)(message).replace(/^0x/, "");
+	if (typeof message === "string" && message.startsWith("0x")) return message.replace(/^0x/, "");
+	return (0, viem.toHex)(String(message)).replace(/^0x/, "");
+};
 var LedgerEip1193Provider = class {
 	ledger;
 	derivationPath;
@@ -231,18 +254,18 @@ var LedgerEip1193Provider = class {
 		return (0, __injectivelabs_wallet_base.getEvmChainConfig)(this.chainId);
 	}
 	async request(args) {
-		if (args.method === "eth_requestAccounts") return [await this.getAddress()];
-		if (args.method === "eth_sign") {
-			if (!args.params[0]) throw new Error("Missing parameter for eth_sign");
-			return this.signMessage(args.params[0]);
+		if (args.method === "eth_requestAccounts" || args.method === "eth_accounts") return [await this.getAddress()];
+		if (signMessageMethods.has(args.method)) {
+			if (!args.params[0]) throw new Error(`Missing parameter for ${args.method}`);
+			return this.signMessage(getMessageHex(getMessageParam(args.method, args.params)));
 		}
 		if (args.method === "eth_signTransaction") {
 			if (!args.params[0]) throw new Error("Missing parameter for eth_signTransaction");
 			return this.signTransaction(args.params[0]);
 		}
-		if (args.method === "eth_signTypedData") {
-			if (!args.params[0]) throw new Error("Missing parameter for eth_signTypedData");
-			return this.signTypedData(args.params[0]);
+		if (signTypedDataMethods.has(args.method)) {
+			if (!args.params[0]) throw new Error(`Missing parameter for ${args.method}`);
+			return this.signTypedData(getTypedDataParam(args.method, args.params));
 		}
 		if (args.method === "eth_chainId") return `0x${this.chainId.toString(16)}`;
 		if (args.method === "wallet_switchEthereumChain") return this.setChainId(args.params[0]?.chainId || "0x1");

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { hashDomain, hashStruct, serializeTransaction } from "viem";
+import { hashDomain, hashStruct, serializeTransaction, toHex } from "viem";
 import { TxGrpcApi } from "@injectivelabs/sdk-ts/core/tx";
 import { addHexPrefix, hexToUint8Array, publicKeyToAddress, safeBigIntStringify, sortObjectByKeys, stringToUint8Array, toUtf8, uint8ArrayToBase64, uint8ArrayToHex } from "@injectivelabs/sdk-ts/utils";
 import { CosmosWalletException, ErrorType, GeneralException, LedgerCosmosException, LedgerException, TransactionException, UnspecifiedErrorCode, WalletException } from "@injectivelabs/exceptions";
@@ -166,6 +166,29 @@ var LedgerTransport$1 = class LedgerTransport$1 {
 
 //#endregion
 //#region src/strategy/Ledger/Eip1193Provider.ts
+const signTypedDataMethods = new Set([
+	"eth_signTypedData",
+	"eth_signTypedData_v3",
+	"eth_signTypedData_v4"
+]);
+const signMessageMethods = new Set(["eth_sign", "personal_sign"]);
+const isEthAddress = (value) => typeof value === "string" && /^0x[a-fA-F0-9]{40}$/.test(value);
+const getTypedDataParam = (method, params) => {
+	const typedData = isEthAddress(params[0]) ? params[1] : params[0];
+	if (typedData == null || typeof typedData === "string" && typedData.length === 0) throw new Error(`Missing typed data parameter for ${method}`);
+	return typeof typedData === "string" ? typedData : JSON.stringify(typedData);
+};
+const getMessageParam = (method, params) => {
+	let message = params[0];
+	if (method === "eth_sign" || isEthAddress(params[0])) message = params[1];
+	if (!(message instanceof Uint8Array) && (typeof message !== "string" || message.length === 0)) throw new Error(`Missing message parameter for ${method}`);
+	return message;
+};
+const getMessageHex = (message) => {
+	if (message instanceof Uint8Array) return toHex(message).replace(/^0x/, "");
+	if (typeof message === "string" && message.startsWith("0x")) return message.replace(/^0x/, "");
+	return toHex(String(message)).replace(/^0x/, "");
+};
 var LedgerEip1193Provider = class {
 	ledger;
 	derivationPath;
@@ -230,18 +253,18 @@ var LedgerEip1193Provider = class {
 		return getEvmChainConfig(this.chainId);
 	}
 	async request(args) {
-		if (args.method === "eth_requestAccounts") return [await this.getAddress()];
-		if (args.method === "eth_sign") {
-			if (!args.params[0]) throw new Error("Missing parameter for eth_sign");
-			return this.signMessage(args.params[0]);
+		if (args.method === "eth_requestAccounts" || args.method === "eth_accounts") return [await this.getAddress()];
+		if (signMessageMethods.has(args.method)) {
+			if (!args.params[0]) throw new Error(`Missing parameter for ${args.method}`);
+			return this.signMessage(getMessageHex(getMessageParam(args.method, args.params)));
 		}
 		if (args.method === "eth_signTransaction") {
 			if (!args.params[0]) throw new Error("Missing parameter for eth_signTransaction");
 			return this.signTransaction(args.params[0]);
 		}
-		if (args.method === "eth_signTypedData") {
-			if (!args.params[0]) throw new Error("Missing parameter for eth_signTypedData");
-			return this.signTypedData(args.params[0]);
+		if (signTypedDataMethods.has(args.method)) {
+			if (!args.params[0]) throw new Error(`Missing parameter for ${args.method}`);
+			return this.signTypedData(getTypedDataParam(args.method, args.params));
 		}
 		if (args.method === "eth_chainId") return `0x${this.chainId.toString(16)}`;
 		if (args.method === "wallet_switchEthereumChain") return this.setChainId(args.params[0]?.chainId || "0x1");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-ledger",
-  "version": "1.19.22",
+  "version": "1.19.23",
   "description": "Ledger wallet strategy for use with @injectivelabs/wallet-core.",
   "license": "Apache-2.0",
   "author": {
@@ -49,10 +49,10 @@
     "@ledgerhq/hw-transport-webusb": "^6.29.13",
     "buffer": "^6.0.3",
     "viem": "^2.41.2",
-    "@injectivelabs/exceptions": "1.19.22",
-    "@injectivelabs/sdk-ts": "1.19.22",
-    "@injectivelabs/ts-types": "1.19.22",
-    "@injectivelabs/wallet-base": "1.19.22"
+    "@injectivelabs/exceptions": "1.19.23",
+    "@injectivelabs/sdk-ts": "1.19.23",
+    "@injectivelabs/ts-types": "1.19.23",
+    "@injectivelabs/wallet-base": "1.19.23"
   },
   "peerDependencies": {
     "@ethersproject/abi": "^5.7.0",