@injectivelabs/wallet-turnkey 1.19.12 → 1.19.14

package/dist/cjs/index.cjs

@@ -362,12 +362,19 @@ async function createTurnkeyClient(metadata) {
 
 //#endregion
 //#region src/strategy/Eip1193Provider.ts
-const getEip1193ProviderForTurnkey = async (account, chainId) => {
+const parseChainId = (chainId) => {
+	if (typeof chainId === "number") return chainId;
+	if (chainId.startsWith("0x")) return parseInt(chainId.replace("0x", ""), 16);
+	return parseInt(chainId, 10);
+};
+const getEip1193ProviderForTurnkey = async (account, chainId, params = {}) => {
 	return new CustomEip1193Provider({
-		chainId: parseInt(chainId, 16),
+		chainId: parseChainId(chainId),
 		signTypedData: account.signTypedData.bind(account),
 		signMessage: account.signMessage.bind(account),
 		signTransaction: account.signTransaction.bind(account),
+		rpcUrl: params.rpcUrl,
+		rpcUrls: params.rpcUrls,
 		account,
 		address: account.address
 	});
@@ -379,6 +386,8 @@ var CustomEip1193Provider = class {
 		_defineProperty(this, "signTypedData", void 0);
 		_defineProperty(this, "signMessage", void 0);
 		_defineProperty(this, "signTransaction", void 0);
+		_defineProperty(this, "rpcUrl", void 0);
+		_defineProperty(this, "rpcUrls", void 0);
 		_defineProperty(this, "account", void 0);
 		_defineProperty(this, "address", void 0);
 		this.chainId = (_args$chainId = args.chainId) !== null && _args$chainId !== void 0 ? _args$chainId : 1;
@@ -386,15 +395,22 @@ var CustomEip1193Provider = class {
 		this.signMessage = args.signMessage;
 		this.account = args.account;
 		this.address = args.address;
+		this.rpcUrl = args.rpcUrl;
+		this.rpcUrls = args.rpcUrls;
 		this.signTransaction = args.signTransaction;
 	}
+	getRpcUrl() {
+		var _this$rpcUrls;
+		return ((_this$rpcUrls = this.rpcUrls) === null || _this$rpcUrls === void 0 ? void 0 : _this$rpcUrls[this.chainId]) || this.rpcUrl;
+	}
 	async requestAccounts() {
 		return [this.address];
 	}
 	getClient() {
 		return (0, __injectivelabs_wallet_base.getViemWalletClient)({
 			chainId: this.chainId,
-			account: this.account
+			account: this.account,
+			rpcUrl: this.getRpcUrl()
 		});
 	}
 	getChain() {
@@ -416,18 +432,18 @@ var CustomEip1193Provider = class {
 			if (!args.params) throw new Error("params is required");
 			return this.signMessage(args.params[0]);
 		}
-		if (args.method === "eth_chainId") return this.chainId;
+		if (args.method === "eth_chainId") return `0x${this.chainId.toString(16)}`;
 		if (args.method === "wallet_switchEthereumChain") {
 			if (!args.params) throw new Error("params is required");
-			const chainId = String(args.params[0].chainId).replace("0x", "");
-			this.chainId = parseInt(chainId, 16);
+			this.chainId = parseChainId(args.params[0].chainId);
 			return true;
 		}
 		if (args.method === "eth_sendTransaction") {
 			if (!args.params) throw new Error("params is required");
 			const accountClient = (0, __injectivelabs_wallet_base.getViemWalletClient)({
 				chainId: this.chainId,
-				account: this.account
+				account: this.account,
+				rpcUrl: this.getRpcUrl()
 			});
 			const client = this.getClient();
 			const parseHexValue = (value) => {
@@ -452,7 +468,7 @@ var CustomEip1193Provider = class {
 		}
 		if (args.method === "eth_getTransactionCount") {
 			if (!args.params) throw new Error("params is required");
-			return `0x${(await (0, __injectivelabs_wallet_base.getViemPublicClient)(this.chainId).getTransactionCount({
+			return `0x${(await (0, __injectivelabs_wallet_base.getViemPublicClient)(this.chainId, this.getRpcUrl()).getTransactionCount({
 				address: this.address,
 				blockTag: "pending"
 			})).toString(16)}`;
@@ -550,7 +566,7 @@ var TurnkeyWalletStrategy = class extends __injectivelabs_wallet_base.BaseConcre
 			const options = this.evmOptions;
 			const turnkeyWallet = await this.getTurnkeyWallet();
 			const chainId = args.evmChainId || options.evmChainId;
-			const url = options.rpcUrl || ((_options$rpcUrls = options.rpcUrls) === null || _options$rpcUrls === void 0 ? void 0 : _options$rpcUrls[args.evmChainId]);
+			const url = ((_options$rpcUrls = options.rpcUrls) === null || _options$rpcUrls === void 0 ? void 0 : _options$rpcUrls[chainId]) || options.rpcUrl;
 			if (!url) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error("Please pass rpcUrl within the evmOptions"), {
 				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 				context: __injectivelabs_wallet_base.WalletAction.SendEvmTransaction
@@ -647,7 +663,7 @@ var TurnkeyWalletStrategy = class extends __injectivelabs_wallet_base.BaseConcre
 		var _options$rpcUrls2;
 		const options = this.evmOptions;
 		const chainId = evmChainId || options.evmChainId;
-		const url = options.rpcUrl || ((_options$rpcUrls2 = options.rpcUrls) === null || _options$rpcUrls2 === void 0 ? void 0 : _options$rpcUrls2[chainId]);
+		const url = ((_options$rpcUrls2 = options.rpcUrls) === null || _options$rpcUrls2 === void 0 ? void 0 : _options$rpcUrls2[chainId]) || options.rpcUrl;
 		if (!url) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error("Please pass rpcUrl within the evmOptions"), {
 			code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 			context: __injectivelabs_wallet_base.WalletAction.GetEvmTransactionReceipt
@@ -682,7 +698,10 @@ var TurnkeyWalletStrategy = class extends __injectivelabs_wallet_base.BaseConcre
 	async getEip1193Provider() {
 		const turnkeyWallet = await this.getTurnkeyWallet();
 		const checksumAddress = (0, viem.getAddress)((0, __injectivelabs_sdk_ts_utils.getEthereumAddress)((await turnkeyWallet.getAccounts())[0]));
-		return await getEip1193ProviderForTurnkey(await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress), String(this.evmOptions.evmChainId));
+		return await getEip1193ProviderForTurnkey(await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress), String(this.evmOptions.evmChainId), {
+			rpcUrl: this.evmOptions.rpcUrl,
+			rpcUrls: this.evmOptions.rpcUrls
+		});
 	}
 };
 

package/dist/esm/index.js

@@ -362,12 +362,19 @@ async function createTurnkeyClient(metadata) {
 
 //#endregion
 //#region src/strategy/Eip1193Provider.ts
-const getEip1193ProviderForTurnkey = async (account, chainId) => {
+const parseChainId = (chainId) => {
+	if (typeof chainId === "number") return chainId;
+	if (chainId.startsWith("0x")) return parseInt(chainId.replace("0x", ""), 16);
+	return parseInt(chainId, 10);
+};
+const getEip1193ProviderForTurnkey = async (account, chainId, params = {}) => {
 	return new CustomEip1193Provider({
-		chainId: parseInt(chainId, 16),
+		chainId: parseChainId(chainId),
 		signTypedData: account.signTypedData.bind(account),
 		signMessage: account.signMessage.bind(account),
 		signTransaction: account.signTransaction.bind(account),
+		rpcUrl: params.rpcUrl,
+		rpcUrls: params.rpcUrls,
 		account,
 		address: account.address
 	});
@@ -379,6 +386,8 @@ var CustomEip1193Provider = class {
 		_defineProperty(this, "signTypedData", void 0);
 		_defineProperty(this, "signMessage", void 0);
 		_defineProperty(this, "signTransaction", void 0);
+		_defineProperty(this, "rpcUrl", void 0);
+		_defineProperty(this, "rpcUrls", void 0);
 		_defineProperty(this, "account", void 0);
 		_defineProperty(this, "address", void 0);
 		this.chainId = (_args$chainId = args.chainId) !== null && _args$chainId !== void 0 ? _args$chainId : 1;
@@ -386,15 +395,22 @@ var CustomEip1193Provider = class {
 		this.signMessage = args.signMessage;
 		this.account = args.account;
 		this.address = args.address;
+		this.rpcUrl = args.rpcUrl;
+		this.rpcUrls = args.rpcUrls;
 		this.signTransaction = args.signTransaction;
 	}
+	getRpcUrl() {
+		var _this$rpcUrls;
+		return ((_this$rpcUrls = this.rpcUrls) === null || _this$rpcUrls === void 0 ? void 0 : _this$rpcUrls[this.chainId]) || this.rpcUrl;
+	}
 	async requestAccounts() {
 		return [this.address];
 	}
 	getClient() {
 		return getViemWalletClient({
 			chainId: this.chainId,
-			account: this.account
+			account: this.account,
+			rpcUrl: this.getRpcUrl()
 		});
 	}
 	getChain() {
@@ -416,18 +432,18 @@ var CustomEip1193Provider = class {
 			if (!args.params) throw new Error("params is required");
 			return this.signMessage(args.params[0]);
 		}
-		if (args.method === "eth_chainId") return this.chainId;
+		if (args.method === "eth_chainId") return `0x${this.chainId.toString(16)}`;
 		if (args.method === "wallet_switchEthereumChain") {
 			if (!args.params) throw new Error("params is required");
-			const chainId = String(args.params[0].chainId).replace("0x", "");
-			this.chainId = parseInt(chainId, 16);
+			this.chainId = parseChainId(args.params[0].chainId);
 			return true;
 		}
 		if (args.method === "eth_sendTransaction") {
 			if (!args.params) throw new Error("params is required");
 			const accountClient = getViemWalletClient({
 				chainId: this.chainId,
-				account: this.account
+				account: this.account,
+				rpcUrl: this.getRpcUrl()
 			});
 			const client = this.getClient();
 			const parseHexValue = (value) => {
@@ -452,7 +468,7 @@ var CustomEip1193Provider = class {
 		}
 		if (args.method === "eth_getTransactionCount") {
 			if (!args.params) throw new Error("params is required");
-			return `0x${(await getViemPublicClient(this.chainId).getTransactionCount({
+			return `0x${(await getViemPublicClient(this.chainId, this.getRpcUrl()).getTransactionCount({
 				address: this.address,
 				blockTag: "pending"
 			})).toString(16)}`;
@@ -550,7 +566,7 @@ var TurnkeyWalletStrategy = class extends BaseConcreteStrategy {
 			const options = this.evmOptions;
 			const turnkeyWallet = await this.getTurnkeyWallet();
 			const chainId = args.evmChainId || options.evmChainId;
-			const url = options.rpcUrl || ((_options$rpcUrls = options.rpcUrls) === null || _options$rpcUrls === void 0 ? void 0 : _options$rpcUrls[args.evmChainId]);
+			const url = ((_options$rpcUrls = options.rpcUrls) === null || _options$rpcUrls === void 0 ? void 0 : _options$rpcUrls[chainId]) || options.rpcUrl;
 			if (!url) throw new WalletException(/* @__PURE__ */ new Error("Please pass rpcUrl within the evmOptions"), {
 				code: UnspecifiedErrorCode,
 				context: WalletAction.SendEvmTransaction
@@ -647,7 +663,7 @@ var TurnkeyWalletStrategy = class extends BaseConcreteStrategy {
 		var _options$rpcUrls2;
 		const options = this.evmOptions;
 		const chainId = evmChainId || options.evmChainId;
-		const url = options.rpcUrl || ((_options$rpcUrls2 = options.rpcUrls) === null || _options$rpcUrls2 === void 0 ? void 0 : _options$rpcUrls2[chainId]);
+		const url = ((_options$rpcUrls2 = options.rpcUrls) === null || _options$rpcUrls2 === void 0 ? void 0 : _options$rpcUrls2[chainId]) || options.rpcUrl;
 		if (!url) throw new WalletException(/* @__PURE__ */ new Error("Please pass rpcUrl within the evmOptions"), {
 			code: UnspecifiedErrorCode,
 			context: WalletAction.GetEvmTransactionReceipt
@@ -682,7 +698,10 @@ var TurnkeyWalletStrategy = class extends BaseConcreteStrategy {
 	async getEip1193Provider() {
 		const turnkeyWallet = await this.getTurnkeyWallet();
 		const checksumAddress = getAddress(getEthereumAddress((await turnkeyWallet.getAccounts())[0]));
-		return await getEip1193ProviderForTurnkey(await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress), String(this.evmOptions.evmChainId));
+		return await getEip1193ProviderForTurnkey(await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress), String(this.evmOptions.evmChainId), {
+			rpcUrl: this.evmOptions.rpcUrl,
+			rpcUrls: this.evmOptions.rpcUrls
+		});
 	}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-turnkey",
-  "version": "1.19.12",
+  "version": "1.19.14",
   "description": "Turnkey wallet strategy for use with @injectivelabs/wallet-core.",
   "license": "Apache-2.0",
   "author": {
@@ -45,11 +45,11 @@
     "@turnkey/sdk-browser": "5.2.3",
     "@turnkey/viem": "0.9.10",
     "viem": "^2.41.2",
-    "@injectivelabs/sdk-ts": "1.19.12",
-    "@injectivelabs/exceptions": "1.19.12",
-    "@injectivelabs/ts-types": "1.19.12",
-    "@injectivelabs/utils": "1.19.12",
-    "@injectivelabs/wallet-base": "1.19.12"
+    "@injectivelabs/exceptions": "1.19.14",
+    "@injectivelabs/sdk-ts": "1.19.14",
+    "@injectivelabs/utils": "1.19.14",
+    "@injectivelabs/wallet-base": "1.19.14",
+    "@injectivelabs/ts-types": "1.19.14"
   },
   "publishConfig": {
     "access": "public"