thirdweb 5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343 → 5.82.0

package/src/wallets/in-app/core/wallet/in-app-core.test.ts

@@ -1,42 +1,54 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { TEST_CLIENT } from "../../../../../test/src/test-clients.js";
+import { TEST_ACCOUNT_A } from "../../../../../test/src/test-wallets.js";
 import { baseSepolia } from "../../../../chains/chain-definitions/base-sepolia.js";
-import { createThirdwebClient } from "../../../../client/client.js";
 import { getEcosystemInfo } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
-import type { Account } from "../../../interfaces/wallet.js";
+import { predictSmartAccountAddress } from "../../../smart/lib/calls.js";
+import { DEFAULT_ACCOUNT_FACTORY_V0_6 } from "../../../smart/lib/constants.js";
+import type { AuthLoginReturnType } from "../authentication/types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 import { createInAppWallet } from "./in-app-core.js";
-import { autoConnectInAppWallet, connectInAppWallet } from "./index.js";
+import * as InAppWallet from "./index.js";
 
 vi.mock("../../../../analytics/track/connect.js", () => ({
   trackConnect: vi.fn(),
 }));
 
-vi.mock("./index.js", () => ({
-  autoConnectInAppWallet: vi.fn(),
-  connectInAppWallet: vi.fn(),
-}));
-
+vi.spyOn(InAppWallet, "connectInAppWallet");
+vi.spyOn(InAppWallet, "autoConnectInAppWallet");
 vi.mock("../../../ecosystem/get-ecosystem-wallet-auth-options.js", () => ({
   getEcosystemInfo: vi.fn(),
 }));
 
-describe("createInAppWallet", () => {
-  const mockClient = createThirdwebClient({
-    clientId: "test-client",
-  });
+describe.runIf(process.env.TW_SECRET_KEY)("createInAppWallet", () => {
+  const mockClient = TEST_CLIENT;
   const mockChain = baseSepolia;
-  const mockAccount = { address: "0x123" } as Account;
+  const mockAccount = TEST_ACCOUNT_A;
+  const mockUser = {
+    status: "Logged In, Wallet Initialized",
+    walletAddress: TEST_ACCOUNT_A.address,
+    authDetails: {
+      userWalletId: TEST_ACCOUNT_A.address,
+      recoveryShareManagement: "ENCLAVE",
+      email: "test@test.com",
+    },
+    account: mockAccount,
+  } as const;
+  const mockAuthResult: AuthLoginReturnType = {
+    user: mockUser,
+  };
 
   const mockConnectorFactory = vi.fn(() =>
     Promise.resolve({
-      connect: vi.fn(),
+      connect: vi.fn().mockResolvedValue(mockAuthResult),
       logout: vi.fn(() => Promise.resolve({ success: true })),
       authenticate: vi.fn(),
       getAccounts: vi.fn(),
       getAccount: vi.fn(),
       getProfiles: vi.fn(),
-      getUser: vi.fn(),
+      getUser: vi.fn().mockResolvedValue(mockUser),
       linkProfile: vi.fn(),
+      unlinkProfile: vi.fn(),
       preAuthenticate: vi.fn(),
     } as InAppConnector),
   );
@@ -46,8 +58,6 @@ describe("createInAppWallet", () => {
   });
 
   it("should connect successfully", async () => {
-    vi.mocked(connectInAppWallet).mockResolvedValue([mockAccount, mockChain]);
-
     const wallet = createInAppWallet({
       connectorFactory: mockConnectorFactory,
     });
@@ -61,7 +71,7 @@ describe("createInAppWallet", () => {
     });
 
     expect(result).toBe(mockAccount);
-    expect(connectInAppWallet).toHaveBeenCalledWith(
+    expect(InAppWallet.connectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
         client: mockClient,
         chain: mockChain,
@@ -72,11 +82,6 @@ describe("createInAppWallet", () => {
   });
 
   it("should auto connect successfully", async () => {
-    vi.mocked(autoConnectInAppWallet).mockResolvedValue([
-      mockAccount,
-      mockChain,
-    ]);
-
     const wallet = createInAppWallet({
       connectorFactory: mockConnectorFactory,
     });
@@ -87,7 +92,7 @@ describe("createInAppWallet", () => {
     });
 
     expect(result).toBe(mockAccount);
-    expect(autoConnectInAppWallet).toHaveBeenCalledWith(
+    expect(InAppWallet.autoConnectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
         client: mockClient,
         chain: mockChain,
@@ -102,15 +107,13 @@ describe("createInAppWallet", () => {
       smartAccountOptions: {
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: "0x456",
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
       authOptions: [],
       name: "hello world",
       slug: "test-ecosystem",
     });
 
-    vi.mocked(connectInAppWallet).mockResolvedValue([mockAccount, mockChain]);
-
     const wallet = createInAppWallet({
       connectorFactory: mockConnectorFactory,
       ecosystem: { id: "ecosystem.test-ecosystem" },
@@ -124,8 +127,14 @@ describe("createInAppWallet", () => {
       verificationCode: "",
     });
 
-    expect(result).toBe(mockAccount);
-    expect(connectInAppWallet).toHaveBeenCalledWith(
+    const expectedSmartAccountAddress = await predictSmartAccountAddress({
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+      chain: mockChain,
+      adminAddress: TEST_ACCOUNT_A.address,
+      client: mockClient,
+    });
+    expect(result.address).toBe(expectedSmartAccountAddress);
+    expect(InAppWallet.connectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
         client: mockClient,
         chain: mockChain,
@@ -134,7 +143,7 @@ describe("createInAppWallet", () => {
         smartAccount: expect.objectContaining({
           chain: mockChain,
           sponsorGas: true,
-          factoryAddress: "0x456",
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         }),
       }),
       expect.any(Object),
@@ -145,15 +154,13 @@ describe("createInAppWallet", () => {
       smartAccountOptions: {
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: "0x456",
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
       authOptions: [],
       name: "hello world",
       slug: "test-ecosystem",
     });
 
-    vi.mocked(connectInAppWallet).mockResolvedValue([mockAccount, mockChain]);
-
     const wallet = createInAppWallet({
       connectorFactory: mockConnectorFactory,
       ecosystem: { id: "ecosystem.test-ecosystem" },
@@ -166,8 +173,14 @@ describe("createInAppWallet", () => {
       verificationCode: "",
     });
 
-    expect(result).toBe(mockAccount);
-    expect(connectInAppWallet).toHaveBeenCalledWith(
+    const expectedSmartAccountAddress = await predictSmartAccountAddress({
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+      chain: mockChain,
+      adminAddress: TEST_ACCOUNT_A.address,
+      client: mockClient,
+    });
+    expect(result.address).toBe(expectedSmartAccountAddress);
+    expect(InAppWallet.connectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
         client: mockClient,
       }),
@@ -175,7 +188,7 @@ describe("createInAppWallet", () => {
         smartAccount: expect.objectContaining({
           chain: mockChain,
           sponsorGas: true,
-          factoryAddress: "0x456",
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         }),
       }),
       expect.any(Object),
@@ -187,18 +200,13 @@ describe("createInAppWallet", () => {
       smartAccountOptions: {
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: "0x456",
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
       authOptions: [],
       name: "hello world",
       slug: "test-ecosystem",
     });
 
-    vi.mocked(autoConnectInAppWallet).mockResolvedValue([
-      mockAccount,
-      mockChain,
-    ]);
-
     const wallet = createInAppWallet({
       connectorFactory: mockConnectorFactory,
       ecosystem: { id: "ecosystem.test-ecosystem" },
@@ -209,8 +217,14 @@ describe("createInAppWallet", () => {
       chain: mockChain,
     });
 
-    expect(result).toBe(mockAccount);
-    expect(autoConnectInAppWallet).toHaveBeenCalledWith(
+    const expectedSmartAccountAddress = await predictSmartAccountAddress({
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+      chain: mockChain,
+      adminAddress: TEST_ACCOUNT_A.address,
+      client: mockClient,
+    });
+    expect(result.address).toBe(expectedSmartAccountAddress);
+    expect(InAppWallet.autoConnectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
         client: mockClient,
         chain: mockChain,
@@ -219,7 +233,7 @@ describe("createInAppWallet", () => {
         smartAccount: expect.objectContaining({
           chain: mockChain,
           sponsorGas: true,
-          factoryAddress: "0x456",
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         }),
       }),
       expect.any(Object),
@@ -231,18 +245,13 @@ describe("createInAppWallet", () => {
       smartAccountOptions: {
         defaultChainId: mockChain.id,
         sponsorGas: true,
-        accountFactoryAddress: "0x456",
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
       },
       authOptions: [],
       name: "hello world",
       slug: "test-ecosystem",
     });
 
-    vi.mocked(autoConnectInAppWallet).mockResolvedValue([
-      mockAccount,
-      mockChain,
-    ]);
-
     const wallet = createInAppWallet({
       connectorFactory: mockConnectorFactory,
       ecosystem: { id: "ecosystem.test-ecosystem" },
@@ -252,8 +261,14 @@ describe("createInAppWallet", () => {
       client: mockClient,
     });
 
-    expect(result).toBe(mockAccount);
-    expect(autoConnectInAppWallet).toHaveBeenCalledWith(
+    const expectedSmartAccountAddress = await predictSmartAccountAddress({
+      factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+      chain: mockChain,
+      adminAddress: TEST_ACCOUNT_A.address,
+      client: mockClient,
+    });
+    expect(result.address).toBe(expectedSmartAccountAddress);
+    expect(InAppWallet.autoConnectInAppWallet).toHaveBeenCalledWith(
       expect.objectContaining({
         client: mockClient,
       }),
@@ -261,10 +276,56 @@ describe("createInAppWallet", () => {
         smartAccount: expect.objectContaining({
           chain: mockChain,
           sponsorGas: true,
-          factoryAddress: "0x456",
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
         }),
       }),
       expect.any(Object),
     );
   });
+
+  it("should return undefined for getAdminAccount if the account is not a smart account", () => {
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+    });
+
+    expect(wallet.getAdminAccount?.()).toBeUndefined();
+  });
+
+  it("should return undefined if no account is connected", () => {
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+    });
+
+    expect(wallet.getAdminAccount?.()).toBeUndefined();
+  });
+
+  it("should return the admin account for a smart account", async () => {
+    vi.unmock("./index.js");
+    vi.mocked(getEcosystemInfo).mockResolvedValue({
+      smartAccountOptions: {
+        defaultChainId: mockChain.id,
+        sponsorGas: true,
+        accountFactoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+      },
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
+    });
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+      ecosystem: { id: "ecosystem.test-ecosystem" },
+    });
+
+    const smartAccount = await wallet.connect({
+      client: mockClient,
+      strategy: "email",
+      email: "",
+      verificationCode: "",
+    });
+
+    const adminAccount = wallet.getAdminAccount?.();
+    expect(adminAccount).toBeDefined();
+    expect(adminAccount?.address).not.toBe(smartAccount.address);
+  });
 });

package/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -48,6 +48,7 @@ export function createInAppWallet(args: {
   const emitter = createWalletEmitter<"inApp">();
   let createOptions = _createOptions;
   let account: Account | undefined = undefined;
+  let adminAccount: Account | undefined = undefined; // Admin account if smartAccountOptions were provided with connection
   let chain: Chain | undefined = undefined;
   let client: ThirdwebClient | undefined;
 
@@ -98,15 +99,16 @@ export function createInAppWallet(args: {
         }
       }
 
-      const [connectedAccount, connectedChain] = await autoConnectInAppWallet(
-        options,
-        createOptions,
-        connector,
-      );
+      const {
+        account: connectedAccount,
+        chain: connectedChain,
+        adminAccount: _adminAccount,
+      } = await autoConnectInAppWallet(options, createOptions, connector);
 
       // set the states
       client = options.client;
       account = connectedAccount;
+      adminAccount = _adminAccount;
       chain = connectedChain;
       trackConnect({
         client: options.client,
@@ -151,14 +153,16 @@ export function createInAppWallet(args: {
         }
       }
 
-      const [connectedAccount, connectedChain] = await connectInAppWallet(
-        options,
-        createOptions,
-        connector,
-      );
+      const {
+        account: connectedAccount,
+        chain: connectedChain,
+        adminAccount: _adminAccount,
+      } = await connectInAppWallet(options, createOptions, connector);
+
       // set the states
       client = options.client;
       account = connectedAccount;
+      adminAccount = _adminAccount;
       chain = connectedChain;
       trackConnect({
         client: options.client,
@@ -184,6 +188,7 @@ export function createInAppWallet(args: {
         }
       }
       account = undefined;
+      adminAccount = undefined;
       chain = undefined;
       emitter.emit("disconnect", undefined);
     },
@@ -212,7 +217,11 @@ export function createInAppWallet(args: {
           }
         }
 
-        const [connectedAccount, connectedChain] = await autoConnectInAppWallet(
+        const {
+          account: connectedAccount,
+          chain: connectedChain,
+          adminAccount: _adminAccount,
+        } = await autoConnectInAppWallet(
           {
             chain: newChain,
             client,
@@ -220,6 +229,7 @@ export function createInAppWallet(args: {
           createOptions,
           connector,
         );
+        adminAccount = _adminAccount;
         account = connectedAccount;
         chain = connectedChain;
       } else {
@@ -228,5 +238,6 @@ export function createInAppWallet(args: {
       }
       emitter.emit("chainChanged", newChain);
     },
+    getAdminAccount: () => adminAccount,
   };
 }

package/src/wallets/in-app/core/wallet/index.ts

@@ -37,7 +37,7 @@ export async function connectInAppWallet(
     | CreateWalletArgs<"inApp">[1]
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
-): Promise<[Account, Chain]> {
+): Promise<{ account: Account; chain: Chain; adminAccount?: Account }> {
   if (
     // if auth mode is not specified, the default is popup
     createOptions?.auth?.mode !== "popup" &&
@@ -65,15 +65,16 @@ export async function connectInAppWallet(
     "smartAccount" in createOptions &&
     createOptions?.smartAccount
   ) {
-    return convertToSmartAccount({
+    const [account, chain] = await convertToSmartAccount({
       client: options.client,
       authAccount,
       smartAccountOptions: createOptions.smartAccount,
       chain: options.chain,
     });
+    return { account, chain, adminAccount: authAccount };
   }
 
-  return [authAccount, options.chain || ethereum] as const;
+  return { account: authAccount, chain: options.chain || ethereum } as const;
 }
 
 /**
@@ -87,7 +88,7 @@ export async function autoConnectInAppWallet(
     | CreateWalletArgs<"inApp">[1]
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
-): Promise<[Account, Chain]> {
+): Promise<{ account: Account; chain: Chain; adminAccount?: Account }> {
   if (options.authResult && connector.loginWithAuthToken) {
     await connector.loginWithAuthToken(options.authResult);
   }
@@ -104,15 +105,16 @@ export async function autoConnectInAppWallet(
     "smartAccount" in createOptions &&
     createOptions?.smartAccount
   ) {
-    return convertToSmartAccount({
+    const [account, chain] = await convertToSmartAccount({
       client: options.client,
       authAccount,
       smartAccountOptions: createOptions.smartAccount,
       chain: options.chain,
     });
+    return { account, chain, adminAccount: authAccount };
   }
 
-  return [authAccount, options.chain || ethereum] as const;
+  return { account: authAccount, chain: options.chain || ethereum } as const;
 }
 
 async function convertToSmartAccount(options: {
@@ -121,14 +123,9 @@ async function convertToSmartAccount(options: {
   smartAccountOptions: CreateWalletArgs<"smart">[1];
   chain?: Chain;
 }) {
-  const [{ smartWallet }, { connectSmartWallet }] = await Promise.all([
-    import("../../../smart/smart-wallet.js"),
-    import("../../../smart/index.js"),
-  ]);
+  const { connectSmartAccount } = await import("../../../smart/index.js");
 
-  const sa = smartWallet(options.smartAccountOptions);
-  return connectSmartWallet(
-    sa,
+  return connectSmartAccount(
     {
       client: options.client,
       personalAccount: options.authAccount,

package/src/wallets/interfaces/wallet.ts

@@ -2,6 +2,10 @@ import type { Address } from "abitype";
 import type * as ox__TypedData from "ox/TypedData";
 import type { Hex, SignableMessage } from "viem";
 import type { Chain } from "../../chains/types.js";
+import type {
+  AuthorizationRequest,
+  SignedAuthorization,
+} from "../../transaction/actions/eip7702/authorization.js";
 import type {
   EIP712TransactionOptions,
   PreparedTransaction,
@@ -195,6 +199,17 @@ export type Account = {
 
   // OPTIONAL
 
+  /**
+   * Sign the given EIP-7702 authorization object.
+   * @example
+   * ```ts
+   * const signedAuthorization = await account.signAuthorization({ address: "0x...", chainId: 1, nonce: 1n });
+   * ```
+   */
+  signAuthorization?: (
+    authorization: AuthorizationRequest,
+  ) => Promise<SignedAuthorization>;
+
   /**
    * Estimate the gas required to execute the given transaction.
    *

package/src/wallets/private-key.test.ts

@@ -17,6 +17,7 @@ test("default", () => {
     {
       "address": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
       "sendTransaction": [Function],
+      "signAuthorization": [Function],
       "signMessage": [Function],
       "signTransaction": [Function],
       "signTypedData": [Function],

package/src/wallets/private-key.ts

@@ -1,10 +1,13 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
+import * as ox__Authorization from "ox/Authorization";
+import * as ox__Secp256k1 from "ox/Secp256k1";
 import type * as ox__TypedData from "ox/TypedData";
 import { publicKeyToAddress } from "viem/utils";
 import { getCachedChain } from "../chains/utils.js";
 import type { ThirdwebClient } from "../client/client.js";
 import { eth_sendRawTransaction } from "../rpc/actions/eth_sendRawTransaction.js";
 import { getRpcClient } from "../rpc/rpc.js";
+import type { AuthorizationRequest } from "../transaction/actions/eip7702/authorization.js";
 import { signTransaction } from "../transaction/actions/sign-transaction.js";
 import type { SerializableTransaction } from "../transaction/serialize-transaction.js";
 import { type Hex, toHex } from "../utils/encoding/hex.js";
@@ -119,6 +122,13 @@ export function privateKeyToAccount(
         privateKey,
       });
     },
+    signAuthorization: async (authorization: AuthorizationRequest) => {
+      const signature = ox__Secp256k1.sign({
+        payload: ox__Authorization.getSignPayload(authorization),
+        privateKey: privateKey,
+      });
+      return ox__Authorization.from(authorization, { signature });
+    },
   };
 
   return account satisfies Account;