@injectivelabs/wallet-trezor 1.19.22 → 1.19.24

package/dist/cjs/index.cjs

@@ -237,6 +237,24 @@ _defineProperty(BaseTrezorTransport, "initPromise", null);
 
 //#endregion
 //#region src/strategy/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 (typeof message !== "string" || message.length === 0) throw new Error(`Missing message parameter for ${method}`);
+	return message;
+};
 var TrezorEip1193Provider = class {
 	constructor(trezor, params) {
 		_defineProperty(this, "trezor", void 0);
@@ -369,18 +387,18 @@ var TrezorEip1193Provider = 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(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") {

package/dist/esm/index.js

@@ -237,6 +237,24 @@ _defineProperty(BaseTrezorTransport, "initPromise", null);
 
 //#endregion
 //#region src/strategy/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 (typeof message !== "string" || message.length === 0) throw new Error(`Missing message parameter for ${method}`);
+	return message;
+};
 var TrezorEip1193Provider = class {
 	constructor(trezor, params) {
 		_defineProperty(this, "trezor", void 0);
@@ -369,18 +387,18 @@ var TrezorEip1193Provider = 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(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") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-trezor",
-  "version": "1.19.22",
+  "version": "1.19.24",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
   "license": "Apache-2.0",
   "author": {
@@ -45,10 +45,10 @@
     "@trezor/connect": "^9.6.4",
     "@trezor/connect-web": "^9.6.4",
     "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.24",
+    "@injectivelabs/sdk-ts": "1.19.24",
+    "@injectivelabs/ts-types": "1.19.24",
+    "@injectivelabs/wallet-base": "1.19.24"
   },
   "publishConfig": {
     "access": "public"