@dynamic-labs/embedded-wallet-evm 3.0.0-alpha.12 → 3.0.0-alpha.14

package/CHANGELOG.md

@@ -1,4 +1,50 @@
 
+## [3.0.0-alpha.14](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.13...v3.0.0-alpha.14) (2024-07-09)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove setPrimaryWallet in favor of useSwitchWallet (#6212)
+* move getBalance method to wallet so it can be fetched for any wallet not just the active one (#6200)
+* make Wallet a class instead of just a type (#6094)
+
+### Features
+
+* add @dynamic-labs/solana-extension ([#6140](https://github.com/dynamic-labs/DynamicAuth/issues/6140)) ([c0e2a06](https://github.com/dynamic-labs/DynamicAuth/commit/c0e2a067dd83163094b58a15696df8654da47c65))
+* add solana support for multi-asset ([#6222](https://github.com/dynamic-labs/DynamicAuth/issues/6222)) ([9660d79](https://github.com/dynamic-labs/DynamicAuth/commit/9660d7962f1fb01011d68397bb367fdfc5335ca9))
+
+
+### Bug Fixes
+
+* allow closing re-connect wallet modal ([#6250](https://github.com/dynamic-labs/DynamicAuth/issues/6250)) ([55ba25b](https://github.com/dynamic-labs/DynamicAuth/commit/55ba25bd3e907629aaa26e788885bfa38f8fe350))
+* move getBalance method to wallet so it can be fetched for any wallet not just the active one ([#6200](https://github.com/dynamic-labs/DynamicAuth/issues/6200)) ([ee94773](https://github.com/dynamic-labs/DynamicAuth/commit/ee94773df9b31462a325666760fcf1fc70dec68a))
+* move getNameService method to wallet so name service data can be fetched for any wallet ([#6205](https://github.com/dynamic-labs/DynamicAuth/issues/6205)) ([6671ae9](https://github.com/dynamic-labs/DynamicAuth/commit/6671ae92532ffc1889e24519e75f47d336ac0da6))
+* relax phone number length validation ([#6226](https://github.com/dynamic-labs/DynamicAuth/issues/6226)) ([f0969b4](https://github.com/dynamic-labs/DynamicAuth/commit/f0969b4fbdafde07125cddecb16b4bfd011ea65e))
+* sdkHasLoaded flipping back to false with otp ([#6242](https://github.com/dynamic-labs/DynamicAuth/issues/6242)) ([32ad9dd](https://github.com/dynamic-labs/DynamicAuth/commit/32ad9dd2dae7775f494506773fb343fe1a249c65))
+* send transaction demo undefined address/value ([#6248](https://github.com/dynamic-labs/DynamicAuth/issues/6248)) ([036a511](https://github.com/dynamic-labs/DynamicAuth/commit/036a511fb848ef461edd9b7a5d79d478b0f1cf23))
+* set last active account on accountChange request ([#6218](https://github.com/dynamic-labs/DynamicAuth/issues/6218)) ([05797d2](https://github.com/dynamic-labs/DynamicAuth/commit/05797d292aab8b4de02555594d4d1bbd4c9543eb))
+* show ledger toggle when linking wallet ([#6202](https://github.com/dynamic-labs/DynamicAuth/issues/6202)) ([a449c0b](https://github.com/dynamic-labs/DynamicAuth/commit/a449c0bfc4e3a75ccd7084b930c48fbd6c14f691))
+* show user wallet in profile view on single wallet mode even if it's not primary ([#6187](https://github.com/dynamic-labs/DynamicAuth/issues/6187)) ([ffaaeb2](https://github.com/dynamic-labs/DynamicAuth/commit/ffaaeb2c6cbb2868a381d85451ae5574024156bb))
+* stop auto-switching to connected secondary wallet if primary wallet is not connected ([#6196](https://github.com/dynamic-labs/DynamicAuth/issues/6196)) ([4e8bcd2](https://github.com/dynamic-labs/DynamicAuth/commit/4e8bcd2d02d3fca54a0ed29c45b386ae99266b84))
+* stop coinbase and solflare popups when secondary ([#6225](https://github.com/dynamic-labs/DynamicAuth/issues/6225)) ([7e9c104](https://github.com/dynamic-labs/DynamicAuth/commit/7e9c1049a09c9fd513c9a2a746d6baac916f1bf4))
+* stop sending double sign request on network switch ([e325709](https://github.com/dynamic-labs/DynamicAuth/commit/e325709bb5d2d1331fe16cc705398fc7b1cc292a))
+* tunrkey solana signer accept uint8array message ([#6137](https://github.com/dynamic-labs/DynamicAuth/issues/6137)) ([70f89ce](https://github.com/dynamic-labs/DynamicAuth/commit/70f89ce0dafa4c99b318c9c5adce59083cd6d284))
+* update formatting of phantom bitcoin publickey ([#6210](https://github.com/dynamic-labs/DynamicAuth/issues/6210)) ([f58cea9](https://github.com/dynamic-labs/DynamicAuth/commit/f58cea99333fd7c6af8f56f637ee32f1f7ce8d76))
+* use white color in farcaster qr code when in dark mode ([#6245](https://github.com/dynamic-labs/DynamicAuth/issues/6245)) ([a91958d](https://github.com/dynamic-labs/DynamicAuth/commit/a91958d8773be138da8f54791c4c67866257bbad))
+
+
+* make Wallet a class instead of just a type ([#6094](https://github.com/dynamic-labs/DynamicAuth/issues/6094)) ([6dc4672](https://github.com/dynamic-labs/DynamicAuth/commit/6dc4672951cfadc22a6c569e74eae3485bd472f3))
+* remove setPrimaryWallet in favor of useSwitchWallet ([#6212](https://github.com/dynamic-labs/DynamicAuth/issues/6212)) ([de125e1](https://github.com/dynamic-labs/DynamicAuth/commit/de125e1ebbc20507e4ec07f337f5f5fd13aabcbe))
+
+## [3.0.0-alpha.13](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.12...v3.0.0-alpha.13) (2024-06-27)
+
+
+### Bug Fixes
+
+* coinbase smart wallet better handling in iframes ([#6184](https://github.com/dynamic-labs/DynamicAuth/issues/6184)) ([2c4befe](https://github.com/dynamic-labs/DynamicAuth/commit/2c4befedd09e6a432139cb3d08ea61004c3896d5))
+* show connected network name when icon url is missing ([#6191](https://github.com/dynamic-labs/DynamicAuth/issues/6191)) ([dafd9e3](https://github.com/dynamic-labs/DynamicAuth/commit/dafd9e323f47ca3d61556e9a8c84ba3bfd27af8f))
+* use correct account when creating wallet client ([#6179](https://github.com/dynamic-labs/DynamicAuth/issues/6179)) ([4e45a15](https://github.com/dynamic-labs/DynamicAuth/commit/4e45a15b2d7221ec80df919aa93468a75a94bed3))
+
 ## [3.0.0-alpha.12](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.11...v3.0.0-alpha.12) (2024-06-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/embedded-wallet-evm",
-  "version": "3.0.0-alpha.12",
+  "version": "3.0.0-alpha.14",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -32,13 +32,13 @@
     "@turnkey/iframe-stamper": "2.0.0",
     "@turnkey/viem": "0.4.10",
     "@turnkey/webauthn-stamper": "0.5.0",
-    "@dynamic-labs/embedded-wallet": "3.0.0-alpha.12",
-    "@dynamic-labs/rpc-provider-ethereum": "3.0.0-alpha.12",
-    "@dynamic-labs/types": "3.0.0-alpha.12",
-    "@dynamic-labs/utils": "3.0.0-alpha.12",
-    "@dynamic-labs/viem-utils": "3.0.0-alpha.12",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.12",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.12"
+    "@dynamic-labs/embedded-wallet": "3.0.0-alpha.14",
+    "@dynamic-labs/rpc-provider-ethereum": "3.0.0-alpha.14",
+    "@dynamic-labs/types": "3.0.0-alpha.14",
+    "@dynamic-labs/utils": "3.0.0-alpha.14",
+    "@dynamic-labs/viem-utils": "3.0.0-alpha.14",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.14",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.14"
   },
   "peerDependencies": {
     "viem": "^2.7.6"

package/src/lib/TurnkeyEVMWalletConnector/TurnkeyEVMWalletConnector.cjs

@@ -10,6 +10,7 @@ var iframeStamper = require('@turnkey/iframe-stamper');
 var viem$1 = require('@turnkey/viem');
 var webauthnStamper = require('@turnkey/webauthn-stamper');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 var utils = require('@dynamic-labs/utils');
 var viemUtils = require('@dynamic-labs/viem-utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
@@ -85,12 +86,8 @@ class TurnkeyEVMWalletConnector extends embeddedWallet.TurnkeyWalletConnectorBas
             networks: this.evmNetworks,
         });
     }
-    getBalance() {
+    getBalance(address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const address = this.turnkeyAddress;
-            if (!address) {
-                return undefined;
-            }
             const rpcUrl = this.getRpcUrl();
             if (!rpcUrl) {
                 return undefined;
@@ -136,9 +133,6 @@ class TurnkeyEVMWalletConnector extends embeddedWallet.TurnkeyWalletConnectorBas
     }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isSessionKeyCompatible()) {
-                yield this.createOrRestoreSession();
-            }
             yield this.getTurnkeyAccount();
             return this.getWalletClient();
         });
@@ -195,16 +189,40 @@ class TurnkeyEVMWalletConnector extends embeddedWallet.TurnkeyWalletConnectorBas
         });
     }
     // Private methods
-    refreshTurnkeyAccount() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            this._turnkeyAccount = undefined;
-            return this.getTurnkeyAccount();
-        });
-    }
     get currentChainId() {
         var _a, _b, _c;
         return (_a = this._selectedChainId) !== null && _a !== void 0 ? _a : (_c = (_b = this.evmNetworks) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.chainId;
     }
+    get lastUsedChainId() {
+        const lastUsedChainIdLS = localStorage.getItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
+        if (!lastUsedChainIdLS)
+            return undefined;
+        try {
+            const chainId = parseInt(lastUsedChainIdLS);
+            if (isNaN(chainId)) {
+                return undefined;
+            }
+            const isChainCurrentlyEnabled = this.evmNetworks.some((network) => network.chainId === chainId);
+            if (!isChainCurrentlyEnabled) {
+                const lastUsedChainId = this.evmNetworks[0].chainId;
+                this.lastUsedChainId = lastUsedChainId;
+                return this.lastUsedChainId;
+            }
+            return chainId;
+        }
+        catch (err) {
+            walletConnectorCore.logger.error(err);
+            return undefined;
+        }
+    }
+    set lastUsedChainId(chainId) {
+        if (chainId === undefined) {
+            localStorage.removeItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
+        }
+        else {
+            localStorage.setItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey, chainId.toString());
+        }
+    }
     get networkRpcUrl() {
         const chainId = this.currentChainId;
         const evmNetwork = this.evmNetworks.find((network) => network.chainId === chainId);
@@ -221,6 +239,91 @@ class TurnkeyEVMWalletConnector extends embeddedWallet.TurnkeyWalletConnectorBas
         const chainId = this.currentChainId;
         return this.evmNetworks.find((network) => network.chainId === chainId);
     }
+    internalSignTransaction(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ transaction, args, address, turnkeySubOrganizationId, }) {
+            yield this.createOrRestoreSession();
+            const newTurnkeyAccount = yield this.createTurnkeyAccount({
+                address,
+                turnkeySubOrganizationId,
+            });
+            try {
+                return yield newTurnkeyAccount.signTransaction(transaction, args);
+            }
+            catch (err) {
+                yield this.removeSessionKeys();
+                yield this.createOrRestoreSession({
+                    ignoreRestore: true,
+                });
+                const newTurnkeyAccount = yield this.createTurnkeyAccount({
+                    address,
+                    turnkeySubOrganizationId,
+                });
+                return newTurnkeyAccount.signTransaction(transaction, args);
+            }
+        });
+    }
+    internalSignTypedData(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ typedData, address, turnkeySubOrganizationId, }) {
+            yield this.createOrRestoreSession();
+            const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                address,
+                turnkeySubOrganizationId,
+            });
+            try {
+                return yield newTurnkeyAccountRaw.signTypedData(typedData);
+            }
+            catch (err) {
+                yield this.removeSessionKeys();
+                yield this.createOrRestoreSession({
+                    ignoreRestore: true,
+                });
+                const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                    address,
+                    turnkeySubOrganizationId,
+                });
+                return newTurnkeyAccountRaw.signTypedData(typedData);
+            }
+        });
+    }
+    internalSignMessage(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ message, address, turnkeySubOrganizationId, }) {
+            yield this.createOrRestoreSession();
+            const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                address,
+                turnkeySubOrganizationId,
+            });
+            try {
+                return yield newTurnkeyAccountRaw.signMessage({ message });
+            }
+            catch (err) {
+                yield this.removeSessionKeys();
+                yield this.createOrRestoreSession({
+                    ignoreRestore: true,
+                });
+                const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                    address,
+                    turnkeySubOrganizationId,
+                });
+                return newTurnkeyAccountRaw.signMessage({ message });
+            }
+        });
+    }
+    createTurnkeyAccount(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ address, turnkeySubOrganizationId, }) {
+            return viem$1.createAccount({
+                client: this.getTurnkeyClient(),
+                ethereumAddress: address,
+                organizationId: turnkeySubOrganizationId,
+                signWith: address,
+            });
+        });
+    }
+    refreshTurnkeyAccount() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            this._turnkeyAccount = undefined;
+            return this.getTurnkeyAccount();
+        });
+    }
     getTurnkeyAccount() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -232,45 +335,34 @@ class TurnkeyEVMWalletConnector extends embeddedWallet.TurnkeyWalletConnectorBas
             if (!turnkeySubOrganizationId || !address) {
                 return;
             }
-            this._turnkeyAccount = yield viem$1.createAccount({
-                client: this.getTurnkeyClient(),
-                ethereumAddress: address,
-                organizationId: turnkeySubOrganizationId,
-                signWith: address,
+            this._turnkeyAccount = accounts.toAccount({
+                address: address,
+                signMessage: (_c) => _tslib.__awaiter(this, [_c], void 0, function* ({ message, }) {
+                    return this.internalSignMessage({
+                        address: address,
+                        message,
+                        turnkeySubOrganizationId,
+                    });
+                }),
+                signTransaction: (transaction, args) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTransaction({
+                        address: address,
+                        args,
+                        transaction,
+                        turnkeySubOrganizationId,
+                    });
+                }),
+                signTypedData: (typedData) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTypedData({
+                        address: address,
+                        turnkeySubOrganizationId,
+                        typedData,
+                    });
+                }),
             });
             return this._turnkeyAccount;
         });
     }
-    get lastUsedChainId() {
-        const lastUsedChainIdLS = localStorage.getItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
-        if (!lastUsedChainIdLS)
-            return undefined;
-        try {
-            const chainId = parseInt(lastUsedChainIdLS);
-            if (isNaN(chainId)) {
-                return undefined;
-            }
-            const isChainCurrentlyEnabled = this.evmNetworks.some((network) => network.chainId === chainId);
-            if (!isChainCurrentlyEnabled) {
-                const lastUsedChainId = this.evmNetworks[0].chainId;
-                this.lastUsedChainId = lastUsedChainId;
-                return this.lastUsedChainId;
-            }
-            return chainId;
-        }
-        catch (err) {
-            walletConnectorCore.logger.error(err);
-            return undefined;
-        }
-    }
-    set lastUsedChainId(chainId) {
-        if (chainId === undefined) {
-            localStorage.removeItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
-        }
-        else {
-            localStorage.setItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey, chainId.toString());
-        }
-    }
     createUiTransaction(from) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const walletClient = this.getWalletClient();

package/src/lib/TurnkeyEVMWalletConnector/TurnkeyEVMWalletConnector.d.ts

@@ -39,19 +39,23 @@ export declare class TurnkeyEVMWalletConnector extends TurnkeyWalletConnectorBas
     }): Promise<void>;
     setVerifiedCredentials(verifiedCredentials: JwtVerifiedCredential[]): void;
     getRpcUrl(): string | undefined;
-    getBalance(): Promise<string | undefined>;
+    getBalance(address: string): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     getPublicClient(): Promise<void | PublicClient<Transport, ViemChain> | undefined>;
     getSigner(): Promise<WalletClient<Transport, ViemChain, Account> | undefined>;
     getTurnkeyClient(): TurnkeyClient;
     getAccount(): Promise<LocalAccount>;
     getWalletClient(): WalletClient<Transport, ViemChain, Account> | undefined;
-    private refreshTurnkeyAccount;
     private get currentChainId();
+    get lastUsedChainId(): number | undefined;
+    set lastUsedChainId(chainId: number | undefined);
     private get networkRpcUrl();
     private get currentEvmNetwork();
+    private internalSignTransaction;
+    private internalSignTypedData;
+    private internalSignMessage;
+    private createTurnkeyAccount;
+    private refreshTurnkeyAccount;
     private getTurnkeyAccount;
-    get lastUsedChainId(): number | undefined;
-    set lastUsedChainId(chainId: number | undefined);
     createUiTransaction(from: string): Promise<IUITransaction>;
 }

package/src/lib/TurnkeyEVMWalletConnector/TurnkeyEVMWalletConnector.js

@@ -6,6 +6,7 @@ import { IframeStamper } from '@turnkey/iframe-stamper';
 import { createAccount } from '@turnkey/viem';
 import { WebauthnStamper } from '@turnkey/webauthn-stamper';
 import { http, createPublicClient, formatEther } from 'viem';
+import { toAccount } from 'viem/accounts';
 import { parseEvmNetworks, getTLD, PlatformService, DynamicError } from '@dynamic-labs/utils';
 import { createWalletClientWithUiConfirmation, getOrMapViemChain, createViemUiTransaction } from '@dynamic-labs/viem-utils';
 import { getRpcUrlForChain, logger } from '@dynamic-labs/wallet-connector-core';
@@ -81,12 +82,8 @@ class TurnkeyEVMWalletConnector extends TurnkeyWalletConnectorBase {
             networks: this.evmNetworks,
         });
     }
-    getBalance() {
+    getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const address = this.turnkeyAddress;
-            if (!address) {
-                return undefined;
-            }
             const rpcUrl = this.getRpcUrl();
             if (!rpcUrl) {
                 return undefined;
@@ -132,9 +129,6 @@ class TurnkeyEVMWalletConnector extends TurnkeyWalletConnectorBase {
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isSessionKeyCompatible()) {
-                yield this.createOrRestoreSession();
-            }
             yield this.getTurnkeyAccount();
             return this.getWalletClient();
         });
@@ -191,16 +185,40 @@ class TurnkeyEVMWalletConnector extends TurnkeyWalletConnectorBase {
         });
     }
     // Private methods
-    refreshTurnkeyAccount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._turnkeyAccount = undefined;
-            return this.getTurnkeyAccount();
-        });
-    }
     get currentChainId() {
         var _a, _b, _c;
         return (_a = this._selectedChainId) !== null && _a !== void 0 ? _a : (_c = (_b = this.evmNetworks) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.chainId;
     }
+    get lastUsedChainId() {
+        const lastUsedChainIdLS = localStorage.getItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
+        if (!lastUsedChainIdLS)
+            return undefined;
+        try {
+            const chainId = parseInt(lastUsedChainIdLS);
+            if (isNaN(chainId)) {
+                return undefined;
+            }
+            const isChainCurrentlyEnabled = this.evmNetworks.some((network) => network.chainId === chainId);
+            if (!isChainCurrentlyEnabled) {
+                const lastUsedChainId = this.evmNetworks[0].chainId;
+                this.lastUsedChainId = lastUsedChainId;
+                return this.lastUsedChainId;
+            }
+            return chainId;
+        }
+        catch (err) {
+            logger.error(err);
+            return undefined;
+        }
+    }
+    set lastUsedChainId(chainId) {
+        if (chainId === undefined) {
+            localStorage.removeItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
+        }
+        else {
+            localStorage.setItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey, chainId.toString());
+        }
+    }
     get networkRpcUrl() {
         const chainId = this.currentChainId;
         const evmNetwork = this.evmNetworks.find((network) => network.chainId === chainId);
@@ -217,6 +235,91 @@ class TurnkeyEVMWalletConnector extends TurnkeyWalletConnectorBase {
         const chainId = this.currentChainId;
         return this.evmNetworks.find((network) => network.chainId === chainId);
     }
+    internalSignTransaction(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ transaction, args, address, turnkeySubOrganizationId, }) {
+            yield this.createOrRestoreSession();
+            const newTurnkeyAccount = yield this.createTurnkeyAccount({
+                address,
+                turnkeySubOrganizationId,
+            });
+            try {
+                return yield newTurnkeyAccount.signTransaction(transaction, args);
+            }
+            catch (err) {
+                yield this.removeSessionKeys();
+                yield this.createOrRestoreSession({
+                    ignoreRestore: true,
+                });
+                const newTurnkeyAccount = yield this.createTurnkeyAccount({
+                    address,
+                    turnkeySubOrganizationId,
+                });
+                return newTurnkeyAccount.signTransaction(transaction, args);
+            }
+        });
+    }
+    internalSignTypedData(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ typedData, address, turnkeySubOrganizationId, }) {
+            yield this.createOrRestoreSession();
+            const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                address,
+                turnkeySubOrganizationId,
+            });
+            try {
+                return yield newTurnkeyAccountRaw.signTypedData(typedData);
+            }
+            catch (err) {
+                yield this.removeSessionKeys();
+                yield this.createOrRestoreSession({
+                    ignoreRestore: true,
+                });
+                const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                    address,
+                    turnkeySubOrganizationId,
+                });
+                return newTurnkeyAccountRaw.signTypedData(typedData);
+            }
+        });
+    }
+    internalSignMessage(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ message, address, turnkeySubOrganizationId, }) {
+            yield this.createOrRestoreSession();
+            const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                address,
+                turnkeySubOrganizationId,
+            });
+            try {
+                return yield newTurnkeyAccountRaw.signMessage({ message });
+            }
+            catch (err) {
+                yield this.removeSessionKeys();
+                yield this.createOrRestoreSession({
+                    ignoreRestore: true,
+                });
+                const newTurnkeyAccountRaw = yield this.createTurnkeyAccount({
+                    address,
+                    turnkeySubOrganizationId,
+                });
+                return newTurnkeyAccountRaw.signMessage({ message });
+            }
+        });
+    }
+    createTurnkeyAccount(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ address, turnkeySubOrganizationId, }) {
+            return createAccount({
+                client: this.getTurnkeyClient(),
+                ethereumAddress: address,
+                organizationId: turnkeySubOrganizationId,
+                signWith: address,
+            });
+        });
+    }
+    refreshTurnkeyAccount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._turnkeyAccount = undefined;
+            return this.getTurnkeyAccount();
+        });
+    }
     getTurnkeyAccount() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -228,45 +331,34 @@ class TurnkeyEVMWalletConnector extends TurnkeyWalletConnectorBase {
             if (!turnkeySubOrganizationId || !address) {
                 return;
             }
-            this._turnkeyAccount = yield createAccount({
-                client: this.getTurnkeyClient(),
-                ethereumAddress: address,
-                organizationId: turnkeySubOrganizationId,
-                signWith: address,
+            this._turnkeyAccount = toAccount({
+                address: address,
+                signMessage: (_c) => __awaiter(this, [_c], void 0, function* ({ message, }) {
+                    return this.internalSignMessage({
+                        address: address,
+                        message,
+                        turnkeySubOrganizationId,
+                    });
+                }),
+                signTransaction: (transaction, args) => __awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTransaction({
+                        address: address,
+                        args,
+                        transaction,
+                        turnkeySubOrganizationId,
+                    });
+                }),
+                signTypedData: (typedData) => __awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTypedData({
+                        address: address,
+                        turnkeySubOrganizationId,
+                        typedData,
+                    });
+                }),
             });
             return this._turnkeyAccount;
         });
     }
-    get lastUsedChainId() {
-        const lastUsedChainIdLS = localStorage.getItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
-        if (!lastUsedChainIdLS)
-            return undefined;
-        try {
-            const chainId = parseInt(lastUsedChainIdLS);
-            if (isNaN(chainId)) {
-                return undefined;
-            }
-            const isChainCurrentlyEnabled = this.evmNetworks.some((network) => network.chainId === chainId);
-            if (!isChainCurrentlyEnabled) {
-                const lastUsedChainId = this.evmNetworks[0].chainId;
-                this.lastUsedChainId = lastUsedChainId;
-                return this.lastUsedChainId;
-            }
-            return chainId;
-        }
-        catch (err) {
-            logger.error(err);
-            return undefined;
-        }
-    }
-    set lastUsedChainId(chainId) {
-        if (chainId === undefined) {
-            localStorage.removeItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey);
-        }
-        else {
-            localStorage.setItem(TurnkeyEVMWalletConnector.lastUsedChainIdStorageKey, chainId.toString());
-        }
-    }
     createUiTransaction(from) {
         return __awaiter(this, void 0, void 0, function* () {
             const walletClient = this.getWalletClient();