thirdweb 5.73.1-nightly-33c23e789e577bd6463e135cec4e25cfcfc9964a-20241205000340 → 5.75.0-nightly-ec84ed37d6db8281d3afb12bc47a20ccc5fe9713-20241207000341

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

@@ -0,0 +1,270 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+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 type { InAppConnector } from "../interfaces/connector.js";
+import { createInAppWallet } from "./in-app-core.js";
+import { autoConnectInAppWallet, connectInAppWallet } from "./index.js";
+
+vi.mock("../../../../analytics/track/connect.js", () => ({
+  trackConnect: vi.fn(),
+}));
+
+vi.mock("./index.js", () => ({
+  autoConnectInAppWallet: vi.fn(),
+  connectInAppWallet: vi.fn(),
+}));
+
+vi.mock("../../../ecosystem/get-ecosystem-wallet-auth-options.js", () => ({
+  getEcosystemInfo: vi.fn(),
+}));
+
+describe("createInAppWallet", () => {
+  const mockClient = createThirdwebClient({
+    clientId: "test-client",
+  });
+  const mockChain = baseSepolia;
+  const mockAccount = { address: "0x123" } as Account;
+
+  const mockConnectorFactory = vi.fn(() =>
+    Promise.resolve({
+      connect: vi.fn(),
+      logout: vi.fn(() => Promise.resolve({ success: true })),
+      authenticate: vi.fn(),
+      getAccounts: vi.fn(),
+      getAccount: vi.fn(),
+      getProfiles: vi.fn(),
+      getUser: vi.fn(),
+      linkProfile: vi.fn(),
+      preAuthenticate: vi.fn(),
+    } as InAppConnector),
+  );
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should connect successfully", async () => {
+    vi.mocked(connectInAppWallet).mockResolvedValue([mockAccount, mockChain]);
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+    });
+
+    const result = await wallet.connect({
+      client: mockClient,
+      chain: mockChain,
+      strategy: "email",
+      email: "",
+      verificationCode: "",
+    });
+
+    expect(result).toBe(mockAccount);
+    expect(connectInAppWallet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        client: mockClient,
+        chain: mockChain,
+      }),
+      undefined,
+      expect.any(Object),
+    );
+  });
+
+  it("should auto connect successfully", async () => {
+    vi.mocked(autoConnectInAppWallet).mockResolvedValue([
+      mockAccount,
+      mockChain,
+    ]);
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+    });
+
+    const result = await wallet.autoConnect({
+      client: mockClient,
+      chain: mockChain,
+    });
+
+    expect(result).toBe(mockAccount);
+    expect(autoConnectInAppWallet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        client: mockClient,
+        chain: mockChain,
+      }),
+      undefined,
+      expect.any(Object),
+    );
+  });
+
+  it("should handle ecosystem wallet connection with smart account settings", async () => {
+    vi.mocked(getEcosystemInfo).mockResolvedValue({
+      smartAccountOptions: {
+        defaultChainId: mockChain.id,
+        sponsorGas: true,
+        accountFactoryAddress: "0x456",
+      },
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
+    });
+
+    vi.mocked(connectInAppWallet).mockResolvedValue([mockAccount, mockChain]);
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+      ecosystem: { id: "ecosystem.test-ecosystem" },
+    });
+
+    const result = await wallet.connect({
+      client: mockClient,
+      chain: mockChain,
+      strategy: "email",
+      email: "",
+      verificationCode: "",
+    });
+
+    expect(result).toBe(mockAccount);
+    expect(connectInAppWallet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        client: mockClient,
+        chain: mockChain,
+      }),
+      expect.objectContaining({
+        smartAccount: expect.objectContaining({
+          chain: mockChain,
+          sponsorGas: true,
+          factoryAddress: "0x456",
+        }),
+      }),
+      expect.any(Object),
+    );
+  });
+  it("should handle ecosystem wallet connection with smart account settings even when no chain is set", async () => {
+    vi.mocked(getEcosystemInfo).mockResolvedValue({
+      smartAccountOptions: {
+        defaultChainId: mockChain.id,
+        sponsorGas: true,
+        accountFactoryAddress: "0x456",
+      },
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
+    });
+
+    vi.mocked(connectInAppWallet).mockResolvedValue([mockAccount, mockChain]);
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+      ecosystem: { id: "ecosystem.test-ecosystem" },
+    });
+
+    const result = await wallet.connect({
+      client: mockClient,
+      strategy: "email",
+      email: "",
+      verificationCode: "",
+    });
+
+    expect(result).toBe(mockAccount);
+    expect(connectInAppWallet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        client: mockClient,
+      }),
+      expect.objectContaining({
+        smartAccount: expect.objectContaining({
+          chain: mockChain,
+          sponsorGas: true,
+          factoryAddress: "0x456",
+        }),
+      }),
+      expect.any(Object),
+    );
+  });
+
+  it("should handle ecosystem wallet auto connection with smart account settings", async () => {
+    vi.mocked(getEcosystemInfo).mockResolvedValue({
+      smartAccountOptions: {
+        defaultChainId: mockChain.id,
+        sponsorGas: true,
+        accountFactoryAddress: "0x456",
+      },
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
+    });
+
+    vi.mocked(autoConnectInAppWallet).mockResolvedValue([
+      mockAccount,
+      mockChain,
+    ]);
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+      ecosystem: { id: "ecosystem.test-ecosystem" },
+    });
+
+    const result = await wallet.autoConnect({
+      client: mockClient,
+      chain: mockChain,
+    });
+
+    expect(result).toBe(mockAccount);
+    expect(autoConnectInAppWallet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        client: mockClient,
+        chain: mockChain,
+      }),
+      expect.objectContaining({
+        smartAccount: expect.objectContaining({
+          chain: mockChain,
+          sponsorGas: true,
+          factoryAddress: "0x456",
+        }),
+      }),
+      expect.any(Object),
+    );
+  });
+
+  it("should handle ecosystem wallet auto connection with smart account settings even when no chain is set", async () => {
+    vi.mocked(getEcosystemInfo).mockResolvedValue({
+      smartAccountOptions: {
+        defaultChainId: mockChain.id,
+        sponsorGas: true,
+        accountFactoryAddress: "0x456",
+      },
+      authOptions: [],
+      name: "hello world",
+      slug: "test-ecosystem",
+    });
+
+    vi.mocked(autoConnectInAppWallet).mockResolvedValue([
+      mockAccount,
+      mockChain,
+    ]);
+
+    const wallet = createInAppWallet({
+      connectorFactory: mockConnectorFactory,
+      ecosystem: { id: "ecosystem.test-ecosystem" },
+    });
+
+    const result = await wallet.autoConnect({
+      client: mockClient,
+    });
+
+    expect(result).toBe(mockAccount);
+    expect(autoConnectInAppWallet).toHaveBeenCalledWith(
+      expect.objectContaining({
+        client: mockClient,
+      }),
+      expect.objectContaining({
+        smartAccount: expect.objectContaining({
+          chain: mockChain,
+          sponsorGas: true,
+          factoryAddress: "0x456",
+        }),
+      }),
+      expect.any(Object),
+    );
+  });
+});

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

@@ -1,6 +1,9 @@
 import { trackConnect } from "../../../../analytics/track/connect.js";
 import type { Chain } from "../../../../chains/types.js";
-import { getCachedChainIfExists } from "../../../../chains/utils.js";
+import {
+  getCachedChain,
+  getCachedChainIfExists,
+} from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { stringify } from "../../../../utils/json.js";
 import { getEcosystemInfo } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
@@ -74,12 +77,16 @@ export function createInAppWallet(args: {
         const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
         const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
         if (smartAccountOptions) {
-          const preferredChain = options.chain;
+          const { defaultChainId } = ecosystemOptions.smartAccountOptions;
+          const preferredChain =
+            options.chain ??
+            (defaultChainId ? getCachedChain(defaultChainId) : undefined);
           if (!preferredChain) {
             throw new Error(
-              "Chain is required for ecosystem smart accounts, pass it via connect() or via UI components",
+              `A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`,
             );
           }
+
           createOptions = {
             ...createOptions,
             smartAccount: {
@@ -123,12 +130,16 @@ export function createInAppWallet(args: {
         const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
         const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
         if (smartAccountOptions) {
-          const preferredChain = options.chain;
+          const { defaultChainId } = ecosystemOptions.smartAccountOptions;
+          const preferredChain =
+            options.chain ??
+            (defaultChainId ? getCachedChain(defaultChainId) : undefined);
           if (!preferredChain) {
             throw new Error(
-              "Chain is required for ecosystem smart accounts, pass it via connect() or via UI components",
+              `A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`,
             );
           }
+
           createOptions = {
             ...createOptions,
             smartAccount: {

package/src/wallets/in-app/web/ecosystem.ts

@@ -7,7 +7,7 @@ import type {
 import { createInAppWallet } from "../core/wallet/in-app-core.js";
 
 /**
- * Creates an [Ecosystem Wallet](https://portal.thirdweb.com/connect/ecosystems/overview) based on various authentication methods. Full list of available authentication methods [here](/connect/wallet/sign-in-methods/overview).
+ * Creates an [Ecosystem Wallet](https://portal.thirdweb.com/connect/wallet/overview) based on various authentication methods. Full list of available authentication methods [here](/connect/wallet/sign-in-methods/configure).
  *
  * Can also be configured to use Account Abstraction to directly connect to a ERC4337 smart account based on those authentication methods.
  *

package/src/wallets/in-app/web/in-app.ts

@@ -4,7 +4,7 @@ import type { CreateWalletArgs } from "../../wallet-types.js";
 import { createInAppWallet } from "../core/wallet/in-app-core.js";
 
 /**
- * Creates an app scoped wallet for users based on various authentication methods. Full list of available authentication methods [here](https://portal.thirdweb.com/connect/wallet/sign-in-methods/overview).
+ * Creates an app scoped wallet for users based on various authentication methods. Full list of available authentication methods [here](https://portal.thirdweb.com/connect/wallet/sign-in-methods/configure).
  *
  * Can also be configured to use Account Abstraction to directly connect to a ERC4337 smart account based on those authentication methods.
  *
@@ -27,7 +27,7 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  * });
  * ```
  *
- * [View all available social auth methods](https://portal.thirdweb.com/connect/wallet/sign-in-methods/overview)
+ * [View all available social auth methods](https://portal.thirdweb.com/connect/wallet/sign-in-methods/configure)
  *
  * ### Login with email
  *

package/src/wallets/in-app/web/lib/iframe-wallet.ts

@@ -8,7 +8,7 @@ import { getRpcClient } from "../../../../rpc/rpc.js";
 import { getAddress } from "../../../../utils/address.js";
 import { getThirdwebDomains } from "../../../../utils/domains.js";
 import { type Hex, hexToString } from "../../../../utils/encoding/hex.js";
-import { parseTypedData } from "../../../../utils/signatures/helpers/parseTypedData.js";
+import { parseTypedData } from "../../../../utils/signatures/helpers/parse-typed-data.js";
 import type { Prettify } from "../../../../utils/type-utils.js";
 import type {
   Account,
@@ -316,7 +316,7 @@ export class IFrameWallet implements IWebWallet {
                 parsedTypedData.types as SignerProcedureTypes["signTypedDataV4"]["types"],
               message:
                 parsedTypedData.message as SignerProcedureTypes["signTypedDataV4"]["message"],
-              chainId: chainId || 1,
+              chainId: Number.parseInt(BigInt(chainId || 1).toString()),
               partnerId,
               rpcEndpoint: `https://${chainId}.${RPC_URL}`, // TODO (ew) shouldnt be needed
             },

package/src/wallets/injected/index.ts

@@ -16,7 +16,7 @@ import {
   stringToHex,
   uint8ArrayToHex,
 } from "../../utils/encoding/hex.js";
-import { parseTypedData } from "../../utils/signatures/helpers/parseTypedData.js";
+import { parseTypedData } from "../../utils/signatures/helpers/parse-typed-data.js";
 import type { InjectedSupportedWalletIds } from "../__generated__/wallet-ids.js";
 import type { Account, SendTransactionOption } from "../interfaces/wallet.js";
 import type { DisconnectFn, SwitchChainFn } from "../types.js";

package/src/wallets/interfaces/wallet.ts

@@ -1,16 +1,12 @@
 import type { Address } from "abitype";
-import type {
-  Hex,
-  SignableMessage,
-  TransactionSerializable,
-  TypedData,
-  TypedDataDefinition,
-} from "viem";
+import type * as ox__TypedData from "ox/TypedData";
+import type { Hex, SignableMessage } from "viem";
 import type { Chain } from "../../chains/types.js";
 import type {
   EIP712TransactionOptions,
   PreparedTransaction,
 } from "../../transaction/prepare-transaction.js";
+import type { SerializableTransaction } from "../../transaction/serialize-transaction.js";
 import type { SendTransactionResult } from "../../transaction/types.js";
 import type { WalletEmitter } from "../wallet-emitter.js";
 import type {
@@ -20,7 +16,7 @@ import type {
   WalletId,
 } from "../wallet-types.js";
 
-export type SendTransactionOption = TransactionSerializable & {
+export type SendTransactionOption = SerializableTransaction & {
   chainId: number;
   eip712?: EIP712TransactionOptions;
 };
@@ -191,10 +187,10 @@ export type Account = {
    * ```
    */
   signTypedData: <
-    const typedData extends TypedData | Record<string, unknown>,
+    const typedData extends ox__TypedData.TypedData | Record<string, unknown>,
     primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
   >(
-    _typedData: TypedDataDefinition<typedData, primaryType>,
+    _typedData: ox__TypedData.Definition<typedData, primaryType>,
   ) => Promise<Hex>;
 
   // OPTIONAL
@@ -222,7 +218,7 @@ export type Account = {
    * }
    * ```
    */
-  signTransaction?: (tx: TransactionSerializable) => Promise<Hex>;
+  signTransaction?: (tx: SerializableTransaction) => Promise<Hex>;
   /**
    * Send the given array of transactions to the blockchain in a single batch
    *

package/src/wallets/native/create-wallet.ts

@@ -6,8 +6,8 @@ import type { Chain } from "../../chains/types.js";
 import { getCachedChainIfExists } from "../../chains/utils.js";
 import { nativeLocalStorage } from "../../utils/storage/nativeStorage.js";
 import type { WCSupportedWalletIds } from "../__generated__/wallet-ids.js";
+import { getCoinbaseMobileProvider } from "../coinbase/coinbase-mobile.js";
 import { coinbaseWalletSDK } from "../coinbase/coinbase-wallet.js";
-import { getCoinbaseMobileProvider } from "../coinbase/coinbaseMobileSDK.js";
 import { COINBASE } from "../constants.js";
 import { isEcosystemWallet } from "../ecosystem/is-ecosystem-wallet.js";
 import { ecosystemWallet } from "../in-app/native/ecosystem.js";

package/src/wallets/private-key.ts

@@ -1,19 +1,16 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
-import type {
-  SignableMessage,
-  TransactionSerializable,
-  TypedData,
-  TypedDataDefinition,
-} from "viem";
+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 { signTransaction } from "../transaction/actions/sign-transaction.js";
+import type { SerializableTransaction } from "../transaction/serialize-transaction.js";
 import { type Hex, toHex } from "../utils/encoding/hex.js";
 import { signMessage } from "../utils/signatures/sign-message.js";
 import { signTypedData } from "../utils/signatures/sign-typed-data.js";
+import type { Prettify } from "../utils/type-utils.js";
 import type { Account } from "./interfaces/wallet.js";
 
 export type PrivateKeyToAccountOptions = {
@@ -46,6 +43,13 @@ export type PrivateKeyToAccountOptions = {
   privateKey: string;
 };
 
+type Message = Prettify<
+  | string
+  | {
+      raw: Hex | Uint8Array;
+    }
+>;
+
 /**
  * Get an `Account` object from a private key.
  * @param options - The options for `privateKeyToAccount`
@@ -69,14 +73,12 @@ export function privateKeyToAccount(
   const privateKey = `0x${options.privateKey.replace(/^0x/, "")}` satisfies Hex;
 
   const publicKey = toHex(secp256k1.getPublicKey(privateKey.slice(2), false));
-  const address = publicKeyToAddress(publicKey); // TODO: Implement publicKeyToAddress natively (will need checksumAddress downstream)
+  const address = publicKeyToAddress(publicKey);
 
   const account = {
     address,
     sendTransaction: async (
-      // TODO: figure out how we would pass our "chain" object in here?
-      // maybe we *do* actually have to take in a tx object instead of the raw tx?
-      tx: TransactionSerializable & { chainId: number },
+      tx: SerializableTransaction & { chainId: number },
     ) => {
       const rpcRequest = getRpcClient({
         client: client,
@@ -94,24 +96,24 @@ export function privateKeyToAccount(
         transactionHash,
       };
     },
-    signMessage: async ({ message }: { message: SignableMessage }) => {
+    signMessage: async ({ message }: { message: Message }) => {
       return signMessage({
         message,
         privateKey,
       });
     },
     signTypedData: async <
-      const typedData extends TypedData | Record<string, unknown>,
+      const typedData extends ox__TypedData.TypedData | Record<string, unknown>,
       primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
     >(
-      _typedData: TypedDataDefinition<typedData, primaryType>,
+      _typedData: ox__TypedData.Definition<typedData, primaryType>,
     ) => {
       return signTypedData({
         ..._typedData,
         privateKey,
       });
     },
-    signTransaction: async (tx: TransactionSerializable) => {
+    signTransaction: async (tx: SerializableTransaction) => {
       return signTransaction({
         transaction: tx,
         privateKey,