use v5 for local wallets on EOA

Author: arcoraven

src/server/utils/wallets/getLocalWallet.ts

@@ -1,11 +1,15 @@
 import { Static } from "@sinclair/typebox";
 import { getChainByChainIdAsync } from "@thirdweb-dev/chains";
 import { Chain, LocalWallet } from "@thirdweb-dev/wallets";
+import { Wallet } from "ethers";
+import { Address } from "thirdweb";
+import { Account, privateKeyToAccount } from "thirdweb/wallets";
 import { getWalletDetails } from "../../../db/wallets/getWalletDetails";
 import { getConfig } from "../../../utils/cache/getConfig";
 import { networkResponseSchema } from "../../../utils/cache/getSdk";
 import { env } from "../../../utils/env";
 import { logger } from "../../../utils/logger";
+import { thirdwebClient } from "../../../utils/sdk";
 import { LocalFileStorage } from "../storage/localStorage";
 
 interface GetLocalWalletParams {
@@ -86,3 +90,22 @@ export const getLocalWallet = async ({
 
   return wallet;
 };
+
+export const getLocalWalletAccount = async (
+  walletAddress: Address,
+): Promise<Account> => {
+  const json = await new LocalFileStorage(walletAddress).getItem("");
+  if (!json) {
+    throw new Error(`Wallet not found for address ${walletAddress}`);
+  }
+
+  const wallet = await Wallet.fromEncryptedJson(
+    JSON.parse(json).data,
+    env.ENCRYPTION_PASSWORD,
+  );
+
+  return privateKeyToAccount({
+    client: thirdwebClient,
+    privateKey: wallet.privateKey,
+  });
+};

src/utils/account.ts

@@ -8,7 +8,10 @@ import { getWalletDetails } from "../db/wallets/getWalletDetails";
 import { WalletType } from "../schema/wallet";
 import { getAwsKmsWallet } from "../server/utils/wallets/getAwsKmsWallet";
 import { getGcpKmsWallet } from "../server/utils/wallets/getGcpKmsWallet";
-import { getLocalWallet } from "../server/utils/wallets/getLocalWallet";
+import {
+  getLocalWallet,
+  getLocalWalletAccount,
+} from "../server/utils/wallets/getLocalWallet";
 import { getSmartWallet } from "../server/utils/wallets/getSmartWallet";
 import { getChain } from "./chain";
 
@@ -49,6 +52,13 @@ export const getAccount = async (args: {
       });
       break;
     case WalletType.local:
+      // For non-AA
+      // @TODO: Update all wallets to use v5 sdk and avoid ethers.
+      if (!accountAddress) {
+        const account = await getLocalWalletAccount(from);
+        _accountsCache.set(cacheKey, account);
+        return account;
+      }
       wallet = await getLocalWallet({ chainId, walletAddress: from });
       break;
     default:
@@ -77,6 +87,7 @@ export const getAccount = async (args: {
     signer = signer.connect(provider);
   }
 
+  // @TODO: Move all wallets to use v5 SDK and avoid ethers adapter.
   const account = await ethers5Adapter.signer.fromEthers({
     signer,
   });

src/worker/tasks/sendTransactionWorker.ts

@@ -143,6 +143,8 @@ const _sendTransaction = async (
         client: thirdwebClient,
         chain,
         ...queuedTransaction,
+        // Stub the nonce because it will be overridden later.
+        nonce: 1,
       },
     });
   } catch (e: unknown) {