@injectivelabs/wallet-turnkey 1.16.10 → 1.16.11-alpha.0

package/dist/cjs/strategy/Eip1193Provider.d.ts

@@ -0,0 +1,3 @@
+import { Eip1193Provider } from '@injectivelabs/wallet-base';
+import { LocalAccount } from 'viem';
+export declare const getEip1193ProviderForTurnkey: (account: LocalAccount, chainId: string) => Promise<Eip1193Provider>;

package/dist/cjs/strategy/Eip1193Provider.js

@@ -0,0 +1,151 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEip1193ProviderForTurnkey = void 0;
+const viem_1 = require("viem");
+const viemChains = __importStar(require("viem/chains"));
+const getEip1193ProviderForTurnkey = async (account, chainId) => {
+    const provider = new CustomEip1193Provider({
+        chainId: parseInt(chainId, 16),
+        signTypedData: account.signTypedData.bind(account),
+        signMessage: account.signMessage.bind(account),
+        signTransaction: account.signTransaction.bind(account),
+        account,
+        address: account.address,
+    });
+    return provider;
+};
+exports.getEip1193ProviderForTurnkey = getEip1193ProviderForTurnkey;
+class CustomEip1193Provider {
+    chainId;
+    signTypedData;
+    signMessage;
+    signTransaction;
+    account;
+    address;
+    constructor(args) {
+        this.chainId = args.chainId ?? 1;
+        this.signTypedData = args.signTypedData;
+        this.signMessage = args.signMessage;
+        this.account = args.account;
+        this.address = args.address;
+        this.signTransaction = args.signTransaction;
+    }
+    async requestAccounts() {
+        return [this.address];
+    }
+    getClient() {
+        return (0, viem_1.createWalletClient)({
+            chain: this.getChain(),
+            transport: (0, viem_1.http)(),
+        });
+    }
+    getChain() {
+        const chain = (0, viem_1.extractChain)({
+            id: this.chainId,
+            chains: Object.values(viemChains),
+        });
+        return chain;
+    }
+    on(_event, _listener) {
+        throw new Error('Not implemented');
+    }
+    removeListener(..._args) {
+        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');
+            }
+            return this.signTypedData(args.params[0]);
+        }
+        if (args.method === 'eth_signMessage') {
+            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 === '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);
+            return true;
+        }
+        if (args.method === 'eth_sendTransaction') {
+            if (!args.params) {
+                throw new Error('params is required');
+            }
+            const accountClient = (0, viem_1.createWalletClient)({
+                account: this.account,
+                chain: this.getChain(),
+                transport: (0, viem_1.http)(),
+            });
+            const client = this.getClient();
+            const preparedTransaction = await accountClient.prepareTransactionRequest(args.params[0]);
+            const signedTransaction = await this.signTransaction(preparedTransaction);
+            const tx = await client.sendRawTransaction({
+                serializedTransaction: signedTransaction,
+            });
+            return tx;
+        }
+        if (args.method === 'eth_getTransactionCount') {
+            if (!args.params) {
+                throw new Error('params is required');
+            }
+            const client = (0, viem_1.createPublicClient)({
+                chain: this.getChain(),
+                transport: (0, viem_1.http)(),
+            });
+            const count = await client.getTransactionCount({
+                address: this.address,
+                blockTag: 'pending',
+            });
+            return `0x${count.toString(16)}`;
+        }
+        return this.getClient().request({
+            method: args.method,
+            params: args.params,
+        });
+    }
+}

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

@@ -1,5 +1,5 @@
 import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
-import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEvmOptions, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEvmOptions, ConcreteEvmWalletStrategyArgs, Eip1193Provider } from '@injectivelabs/wallet-base';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { TurnkeyIndexedDbClient } from '@turnkey/sdk-browser';
 import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
@@ -42,4 +42,5 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     getPubKey(): Promise<string>;
     getIndexedDbClient(): Promise<TurnkeyIndexedDbClient>;
     private getTurnkeyWallet;
+    getEip1193Provider(): Promise<Eip1193Provider>;
 }

package/dist/cjs/strategy/strategy.js

@@ -10,6 +10,7 @@ const utils_1 = require("@injectivelabs/utils");
 const types_js_1 = require("./types.js");
 const turnkey_js_1 = require("./turnkey/turnkey.js");
 const consts_js_1 = require("./consts.js");
+const Eip1193Provider_js_1 = require("./Eip1193Provider.js");
 class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     turnkeyWallet;
     evmOptions;
@@ -261,5 +262,14 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
         }
         return this.turnkeyWallet;
     }
+    async getEip1193Provider() {
+        const turnkeyWallet = await this.getTurnkeyWallet();
+        const addresses = await turnkeyWallet.getAccounts();
+        //? Turnkey expects the case sensitive address and the current impl of getChecksumAddress from sdk-ts doesn't play nice with browser envs
+        const checksumAddress = (0, viem_1.getAddress)((0, sdk_ts_1.getEthereumAddress)(addresses[0]));
+        const account = await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress);
+        const eip1193Provider = await (0, Eip1193Provider_js_1.getEip1193ProviderForTurnkey)(account, String(this.evmOptions.evmChainId));
+        return eip1193Provider;
+    }
 }
 exports.TurnkeyWalletStrategy = TurnkeyWalletStrategy;

package/dist/cjs/strategy/turnkey/turnkey.js

@@ -125,6 +125,7 @@ class TurnkeyWallet {
         const { accountMap } = this;
         const indexedDbClient = await this.getIndexedDbClient();
         const organizationId = this.userOrganizationId;
+        console.log('accountMap', accountMap);
         if (accountMap[address] || accountMap[address.toLowerCase()]) {
             return accountMap[address] || accountMap[address.toLowerCase()];
         }
@@ -135,6 +136,7 @@ class TurnkeyWallet {
         if (!address) {
             throw new exceptions_1.WalletException(new Error('Account address not found'));
         }
+        console.log('address', address);
         const turnkeyAccount = await (0, viem_1.createAccount)({
             organizationId,
             signWith: address,

package/dist/esm/strategy/Eip1193Provider.d.ts

@@ -0,0 +1,3 @@
+import { Eip1193Provider } from '@injectivelabs/wallet-base';
+import { LocalAccount } from 'viem';
+export declare const getEip1193ProviderForTurnkey: (account: LocalAccount, chainId: string) => Promise<Eip1193Provider>;

package/dist/esm/strategy/Eip1193Provider.js

@@ -0,0 +1,114 @@
+import { extractChain, createWalletClient, http, createPublicClient, } from 'viem';
+import * as viemChains from 'viem/chains';
+export const getEip1193ProviderForTurnkey = async (account, chainId) => {
+    const provider = new CustomEip1193Provider({
+        chainId: parseInt(chainId, 16),
+        signTypedData: account.signTypedData.bind(account),
+        signMessage: account.signMessage.bind(account),
+        signTransaction: account.signTransaction.bind(account),
+        account,
+        address: account.address,
+    });
+    return provider;
+};
+class CustomEip1193Provider {
+    chainId;
+    signTypedData;
+    signMessage;
+    signTransaction;
+    account;
+    address;
+    constructor(args) {
+        this.chainId = args.chainId ?? 1;
+        this.signTypedData = args.signTypedData;
+        this.signMessage = args.signMessage;
+        this.account = args.account;
+        this.address = args.address;
+        this.signTransaction = args.signTransaction;
+    }
+    async requestAccounts() {
+        return [this.address];
+    }
+    getClient() {
+        return createWalletClient({
+            chain: this.getChain(),
+            transport: http(),
+        });
+    }
+    getChain() {
+        const chain = extractChain({
+            id: this.chainId,
+            chains: Object.values(viemChains),
+        });
+        return chain;
+    }
+    on(_event, _listener) {
+        throw new Error('Not implemented');
+    }
+    removeListener(..._args) {
+        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');
+            }
+            return this.signTypedData(args.params[0]);
+        }
+        if (args.method === 'eth_signMessage') {
+            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 === '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);
+            return true;
+        }
+        if (args.method === 'eth_sendTransaction') {
+            if (!args.params) {
+                throw new Error('params is required');
+            }
+            const accountClient = createWalletClient({
+                account: this.account,
+                chain: this.getChain(),
+                transport: http(),
+            });
+            const client = this.getClient();
+            const preparedTransaction = await accountClient.prepareTransactionRequest(args.params[0]);
+            const signedTransaction = await this.signTransaction(preparedTransaction);
+            const tx = await client.sendRawTransaction({
+                serializedTransaction: signedTransaction,
+            });
+            return tx;
+        }
+        if (args.method === 'eth_getTransactionCount') {
+            if (!args.params) {
+                throw new Error('params is required');
+            }
+            const client = createPublicClient({
+                chain: this.getChain(),
+                transport: http(),
+            });
+            const count = await client.getTransactionCount({
+                address: this.address,
+                blockTag: 'pending',
+            });
+            return `0x${count.toString(16)}`;
+        }
+        return this.getClient().request({
+            method: args.method,
+            params: args.params,
+        });
+    }
+}

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

@@ -1,5 +1,5 @@
 import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
-import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEvmOptions, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEvmOptions, ConcreteEvmWalletStrategyArgs, Eip1193Provider } from '@injectivelabs/wallet-base';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { TurnkeyIndexedDbClient } from '@turnkey/sdk-browser';
 import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
@@ -42,4 +42,5 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     getPubKey(): Promise<string>;
     getIndexedDbClient(): Promise<TurnkeyIndexedDbClient>;
     private getTurnkeyWallet;
+    getEip1193Provider(): Promise<Eip1193Provider>;
 }

package/dist/esm/strategy/strategy.js

@@ -1,5 +1,5 @@
 /* eslint-disable class-methods-use-this */
-import { TxGrpcApi, } from '@injectivelabs/sdk-ts';
+import { TxGrpcApi, getEthereumAddress, } from '@injectivelabs/sdk-ts';
 import { ErrorType, WalletException, UnspecifiedErrorCode, TransactionException, CosmosWalletException, } from '@injectivelabs/exceptions';
 import { http, getAddress, createPublicClient, createWalletClient, } from 'viem';
 import { WalletAction, WalletDeviceType, BaseConcreteStrategy, } from '@injectivelabs/wallet-base';
@@ -7,6 +7,7 @@ import { sleep, HttpRestClient } from '@injectivelabs/utils';
 import { TurnkeyErrorCodes } from './types.js';
 import { TurnkeyWallet } from './turnkey/turnkey.js';
 import { DEFAULT_EVM_CHAIN_CONFIG } from './consts.js';
+import { getEip1193ProviderForTurnkey } from './Eip1193Provider.js';
 export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
     turnkeyWallet;
     evmOptions;
@@ -258,4 +259,13 @@ export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
         }
         return this.turnkeyWallet;
     }
+    async getEip1193Provider() {
+        const turnkeyWallet = await this.getTurnkeyWallet();
+        const addresses = await turnkeyWallet.getAccounts();
+        //? Turnkey expects the case sensitive address and the current impl of getChecksumAddress from sdk-ts doesn't play nice with browser envs
+        const checksumAddress = getAddress(getEthereumAddress(addresses[0]));
+        const account = await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress);
+        const eip1193Provider = await getEip1193ProviderForTurnkey(account, String(this.evmOptions.evmChainId));
+        return eip1193Provider;
+    }
 }

package/dist/esm/strategy/turnkey/turnkey.js

@@ -122,6 +122,7 @@ export class TurnkeyWallet {
         const { accountMap } = this;
         const indexedDbClient = await this.getIndexedDbClient();
         const organizationId = this.userOrganizationId;
+        console.log('accountMap', accountMap);
         if (accountMap[address] || accountMap[address.toLowerCase()]) {
             return accountMap[address] || accountMap[address.toLowerCase()];
         }
@@ -132,6 +133,7 @@ export class TurnkeyWallet {
         if (!address) {
             throw new WalletException(new Error('Account address not found'));
         }
+        console.log('address', address);
         const turnkeyAccount = await createAccount({
             organizationId,
             signWith: address,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-turnkey",
   "description": "Turnkey wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.16.10",
+  "version": "1.16.11-alpha.0",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -59,11 +59,11 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "1.16.10",
-    "@injectivelabs/sdk-ts": "1.16.10",
-    "@injectivelabs/ts-types": "1.16.10",
-    "@injectivelabs/utils": "1.16.10",
-    "@injectivelabs/wallet-base": "1.16.10",
+    "@injectivelabs/exceptions": "1.16.11-alpha.0",
+    "@injectivelabs/sdk-ts": "1.16.11-alpha.0",
+    "@injectivelabs/ts-types": "1.16.11-alpha.0",
+    "@injectivelabs/utils": "1.16.11-alpha.0",
+    "@injectivelabs/wallet-base": "1.16.11-alpha.0",
     "@turnkey/sdk-browser": "5.2.3",
     "@turnkey/viem": "^0.9.10",
     "viem": "^2.33.2"
@@ -77,5 +77,5 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.0.0"
   },
-  "gitHead": "77a3be1fe388487b0fd4bdc9b2d9179ccff164d3"
+  "gitHead": "640edf06e57aa38d3176e38fa03dddfc72e901cf"
 }