thirdweb 5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343 → 5.82.0

package/src/wallets/smart/smart-wallet.ts

@@ -137,7 +137,7 @@ export function smartWallet(
   let chain: Chain | undefined = undefined;
   let lastConnectOptions: WalletConnectionOption<"smart"> | undefined;
 
-  const _smartWallet: Wallet<"smart"> = {
+  return {
     id: "smart",
     subscribe: emitter.subscribe,
     getChain() {
@@ -152,9 +152,10 @@ export function smartWallet(
     getAccount: () => account,
     getAdminAccount: () => adminAccount,
     autoConnect: async (options) => {
-      const { connectSmartWallet } = await import("./index.js");
+      const { connectSmartAccount: connectSmartWallet } = await import(
+        "./index.js"
+      );
       const [connectedAccount, connectedChain] = await connectSmartWallet(
-        _smartWallet,
         options,
         createOptions,
       );
@@ -172,9 +173,8 @@ export function smartWallet(
       return account;
     },
     connect: async (options) => {
-      const { connectSmartWallet } = await import("./index.js");
-      const [connectedAccount, connectedChain] = await connectSmartWallet(
-        _smartWallet,
+      const { connectSmartAccount } = await import("./index.js");
+      const [connectedAccount, connectedChain] = await connectSmartAccount(
         options,
         createOptions,
       );
@@ -194,10 +194,13 @@ export function smartWallet(
       return account;
     },
     disconnect: async () => {
+      if (account) {
+        const { disconnectSmartAccount } = await import("./index.js");
+        await disconnectSmartAccount(account);
+      }
       account = undefined;
+      adminAccount = undefined;
       chain = undefined;
-      const { disconnectSmartWallet } = await import("./index.js");
-      await disconnectSmartWallet(_smartWallet);
       emitter.emit("disconnect", undefined);
     },
     switchChain: async (newChain: Chain) => {
@@ -223,9 +226,8 @@ export function smartWallet(
           );
         }
       }
-      const { connectSmartWallet } = await import("./index.js");
-      const [connectedAccount, connectedChain] = await connectSmartWallet(
-        _smartWallet,
+      const { connectSmartAccount } = await import("./index.js");
+      const [connectedAccount, connectedChain] = await connectSmartAccount(
         { ...lastConnectOptions, chain: newChain },
         createOptions,
       );
@@ -235,6 +237,4 @@ export function smartWallet(
       emitter.emit("chainChanged", newChain);
     },
   };
-
-  return _smartWallet;
 }

package/src/wallets/smart/smart.test.ts

@@ -2,7 +2,6 @@ import { describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { defineChain } from "../../chains/utils.js";
 import { generateAccount } from "../utils/generateAccount.js";
-import { connectSmartWallet, disconnectSmartWallet } from "./index.js";
 import { smartWallet } from "./smart-wallet.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("Smart Wallet Index", () => {
@@ -17,67 +16,48 @@ describe.runIf(process.env.TW_SECRET_KEY)("Smart Wallet Index", () => {
         gasless: true,
       });
 
-      const [account, connectedChain] = await connectSmartWallet(
-        wallet,
-        {
-          client,
-          personalAccount,
-        },
-        {
-          chain,
-          gasless: true,
-        },
-      );
+      await wallet.connect({
+        client,
+        personalAccount,
+      });
 
-      expect(account.address).toBeDefined();
-      expect(account.address).toMatch(/^0x[a-fA-F0-9]{40}$/);
-      expect(connectedChain.id).toBe(chain.id);
+      expect(wallet.getAccount()?.address).toBeDefined();
+      expect(wallet.getAccount()?.address).toMatch(/^0x[a-fA-F0-9]{40}$/);
+      expect(wallet.getChain()?.id).toBe(chain.id);
     });
   });
 
   describe("disconnectSmartWallet", () => {
     it("should disconnect a smart wallet", async () => {
       const personalAccount = await generateAccount({ client });
+
       const wallet = smartWallet({
         chain,
         gasless: true,
       });
 
-      await connectSmartWallet(
-        wallet,
-        {
-          client,
-          personalAccount,
-        },
-        {
-          chain,
-          gasless: true,
-        },
-      );
+      await wallet.connect({
+        client,
+        personalAccount,
+      });
 
-      await expect(disconnectSmartWallet(wallet)).resolves.not.toThrow();
+      await expect(wallet.disconnect()).resolves.not.toThrow();
     });
 
     it("should clear wallet mappings on disconnect", async () => {
       const personalAccount = await generateAccount({ client });
+
       const wallet = smartWallet({
         chain,
         gasless: true,
       });
 
-      await connectSmartWallet(
-        wallet,
-        {
-          client,
-          personalAccount,
-        },
-        {
-          chain,
-          gasless: true,
-        },
-      );
+      await wallet.connect({
+        client,
+        personalAccount,
+      });
 
-      await disconnectSmartWallet(wallet);
+      await wallet.disconnect();
 
       // Verify wallet state is cleared
       expect(wallet.getAccount()).toBeUndefined();