@injectivelabs/wallet-turnkey 1.19.21 → 1.19.23

package/dist/cjs/index.cjs

@@ -471,11 +471,50 @@ async function createTurnkeyClient(metadata) {
 
 //#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",
+	"eth_signMessage"
+]);
 const parseChainId = (chainId) => {
 	if (typeof chainId === "number") return chainId;
 	if (chainId.startsWith("0x")) return parseInt(chainId.replace("0x", ""), 16);
 	return parseInt(chainId, 10);
 };
+const isEthAddress = (value) => typeof value === "string" && /^0x[a-fA-F0-9]{40}$/.test(value);
+const getTypedDataParam = (method, params) => {
+	if (!(params === null || params === void 0 ? void 0 : params.length)) throw new Error("params is required");
+	const typedData = isEthAddress(params[0]) ? params[1] : params[0];
+	if (typedData == null || typeof typedData === "string" && typedData.length === 0 || typeof typedData !== "string" && typeof typedData !== "object") throw new Error(`Missing typed data parameter for ${method}`);
+	const parsedTypedData = (() => {
+		if (typeof typedData !== "string") return typedData;
+		try {
+			return JSON.parse(typedData);
+		} catch (_unused) {
+			throw new Error(`Invalid typed data parameter for ${method}`);
+		}
+	})();
+	if (!parsedTypedData || typeof parsedTypedData !== "object" || Array.isArray(parsedTypedData) || !parsedTypedData.domain || !parsedTypedData.types || typeof parsedTypedData.primaryType !== "string" || !("message" in parsedTypedData)) throw new Error(`Invalid typed data parameter for ${method}`);
+	return parsedTypedData;
+};
+const getMessageParam = (method, params) => {
+	if (!(params === null || params === void 0 ? void 0 : params.length)) throw new Error("params is required");
+	let message = params[0];
+	if (method === "eth_sign") message = params[1];
+	if (method === "personal_sign" && isEthAddress(params[0])) message = params[1];
+	if (!(message instanceof Uint8Array) && (typeof message !== "string" || message.length === 0) && !(message && typeof message === "object" && "message" in message)) throw new Error(`Missing message parameter for ${method}`);
+	return message;
+};
+const getSignableMessage = (message) => {
+	if (message && typeof message === "object" && "message" in message) return message;
+	if (message instanceof Uint8Array || typeof message === "string" && message.startsWith("0x")) return { message: { raw: message } };
+	return { message };
+};
 const getEip1193ProviderForTurnkey = async (account, chainId, params = {}) => {
 	var _account$sign;
 	return new CustomEip1193Provider({
@@ -536,10 +575,9 @@ var CustomEip1193Provider = class {
 		throw new Error("Not implemented!");
 	}
 	async request(args) {
-		if (args.method === "eth_requestAccounts") return this.requestAccounts();
-		if (args.method === "eth_signTypedData") {
-			if (!args.params) throw new Error("params is required");
-			const typedData = args.params[0];
+		if (args.method === "eth_requestAccounts" || args.method === "eth_accounts") return this.requestAccounts();
+		if (signTypedDataMethods.has(args.method)) {
+			const typedData = getTypedDataParam(args.method, args.params);
 			if (this.sign) {
 				const typedDataHash = (0, viem.hashTypedData)({
 					domain: {
@@ -554,9 +592,13 @@ var CustomEip1193Provider = class {
 			}
 			return this.signTypedData(typedData);
 		}
-		if (args.method === "eth_signMessage") {
+		if (signMessageMethods.has(args.method)) {
+			const message = getMessageParam(args.method, args.params);
+			return this.signMessage(getSignableMessage(message));
+		}
+		if (args.method === "eth_signTransaction") {
 			if (!args.params) throw new Error("params is required");
-			return this.signMessage(args.params[0]);
+			return this.signTransaction(args.params[0]);
 		}
 		if (args.method === "eth_chainId") return `0x${this.chainId.toString(16)}`;
 		if (args.method === "wallet_switchEthereumChain") {

package/dist/esm/index.js

@@ -471,11 +471,50 @@ async function createTurnkeyClient(metadata) {
 
 //#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",
+	"eth_signMessage"
+]);
 const parseChainId = (chainId) => {
 	if (typeof chainId === "number") return chainId;
 	if (chainId.startsWith("0x")) return parseInt(chainId.replace("0x", ""), 16);
 	return parseInt(chainId, 10);
 };
+const isEthAddress = (value) => typeof value === "string" && /^0x[a-fA-F0-9]{40}$/.test(value);
+const getTypedDataParam = (method, params) => {
+	if (!(params === null || params === void 0 ? void 0 : params.length)) throw new Error("params is required");
+	const typedData = isEthAddress(params[0]) ? params[1] : params[0];
+	if (typedData == null || typeof typedData === "string" && typedData.length === 0 || typeof typedData !== "string" && typeof typedData !== "object") throw new Error(`Missing typed data parameter for ${method}`);
+	const parsedTypedData = (() => {
+		if (typeof typedData !== "string") return typedData;
+		try {
+			return JSON.parse(typedData);
+		} catch (_unused) {
+			throw new Error(`Invalid typed data parameter for ${method}`);
+		}
+	})();
+	if (!parsedTypedData || typeof parsedTypedData !== "object" || Array.isArray(parsedTypedData) || !parsedTypedData.domain || !parsedTypedData.types || typeof parsedTypedData.primaryType !== "string" || !("message" in parsedTypedData)) throw new Error(`Invalid typed data parameter for ${method}`);
+	return parsedTypedData;
+};
+const getMessageParam = (method, params) => {
+	if (!(params === null || params === void 0 ? void 0 : params.length)) throw new Error("params is required");
+	let message = params[0];
+	if (method === "eth_sign") message = params[1];
+	if (method === "personal_sign" && isEthAddress(params[0])) message = params[1];
+	if (!(message instanceof Uint8Array) && (typeof message !== "string" || message.length === 0) && !(message && typeof message === "object" && "message" in message)) throw new Error(`Missing message parameter for ${method}`);
+	return message;
+};
+const getSignableMessage = (message) => {
+	if (message && typeof message === "object" && "message" in message) return message;
+	if (message instanceof Uint8Array || typeof message === "string" && message.startsWith("0x")) return { message: { raw: message } };
+	return { message };
+};
 const getEip1193ProviderForTurnkey = async (account, chainId, params = {}) => {
 	var _account$sign;
 	return new CustomEip1193Provider({
@@ -536,10 +575,9 @@ var CustomEip1193Provider = class {
 		throw new Error("Not implemented!");
 	}
 	async request(args) {
-		if (args.method === "eth_requestAccounts") return this.requestAccounts();
-		if (args.method === "eth_signTypedData") {
-			if (!args.params) throw new Error("params is required");
-			const typedData = args.params[0];
+		if (args.method === "eth_requestAccounts" || args.method === "eth_accounts") return this.requestAccounts();
+		if (signTypedDataMethods.has(args.method)) {
+			const typedData = getTypedDataParam(args.method, args.params);
 			if (this.sign) {
 				const typedDataHash = hashTypedData({
 					domain: {
@@ -554,9 +592,13 @@ var CustomEip1193Provider = class {
 			}
 			return this.signTypedData(typedData);
 		}
-		if (args.method === "eth_signMessage") {
+		if (signMessageMethods.has(args.method)) {
+			const message = getMessageParam(args.method, args.params);
+			return this.signMessage(getSignableMessage(message));
+		}
+		if (args.method === "eth_signTransaction") {
 			if (!args.params) throw new Error("params is required");
-			return this.signMessage(args.params[0]);
+			return this.signTransaction(args.params[0]);
 		}
 		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-turnkey",
-  "version": "1.19.21",
+  "version": "1.19.23",
   "description": "Turnkey wallet strategy for use with @injectivelabs/wallet-core.",
   "license": "Apache-2.0",
   "author": {
@@ -45,11 +45,11 @@
     "@turnkey/sdk-browser": "5.16.1",
     "@turnkey/viem": "0.13.1",
     "viem": "^2.41.2",
-    "@injectivelabs/exceptions": "1.19.21",
-    "@injectivelabs/utils": "1.19.21",
-    "@injectivelabs/wallet-base": "1.19.21",
-    "@injectivelabs/sdk-ts": "1.19.21",
-    "@injectivelabs/ts-types": "1.19.21"
+    "@injectivelabs/ts-types": "1.19.23",
+    "@injectivelabs/utils": "1.19.23",
+    "@injectivelabs/wallet-base": "1.19.23",
+    "@injectivelabs/exceptions": "1.19.23",
+    "@injectivelabs/sdk-ts": "1.19.23"
   },
   "publishConfig": {
     "access": "public"