chore: revert changes

ElasticBottle · ElasticBottle · commit eed086c62304 · 2024-12-05T08:54:10.000+08:00
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx
@@ -1,5 +1,4 @@
 "use client";
-import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { SettingsCard } from "@/components/blocks/SettingsCard";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -24,17 +23,22 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
 import { cn } from "@/lib/utils";
 import { zodResolver } from "@hookform/resolvers/zod";
+import { NetworkSelectorButton } from "components/selects/NetworkSelectorButton";
 import { PlusIcon } from "lucide-react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { isAddress } from "thirdweb";
+import { getCachedChain } from "thirdweb/dist/types/chains/utils";
+import {
+  useActiveWalletChain,
+  useSwitchActiveWalletChain,
+} from "thirdweb/react";
 import { getSocialIcon } from "thirdweb/wallets/in-app";
 import {
   DEFAULT_ACCOUNT_FACTORY_V0_6,
   DEFAULT_ACCOUNT_FACTORY_V0_7,
 } from "thirdweb/wallets/smart";
 import invariant from "tiny-invariant";
-import { FormErrorMessage } from "tw-components";
 import { z } from "zod";
 import { type Ecosystem, authOptions } from "../../../../../types";
 import { useUpdateEcosystem } from "../../hooks/use-update-ecosystem";
@@ -46,7 +50,6 @@ type AuthOptionsFormData = {
   customHeaders: { key: string; value: string }[];
   useSmartAccount: boolean;
   sponsorGas: boolean;
-  chainIds: number[];
   accountFactoryType: "v0.6" | "v0.7" | "custom";
   customAccountFactoryAddress: string;
 };
@@ -60,7 +63,6 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
       customHeaders: ecosystem.customAuthOptions?.authEndpoint?.headers || [],
       useSmartAccount: !!ecosystem.smartAccountOptions,
       sponsorGas: ecosystem.smartAccountOptions?.sponsorGas || false,
-      chainIds: ecosystem.smartAccountOptions?.chainIds ?? [],
       accountFactoryType:
         ecosystem.smartAccountOptions?.accountFactoryAddress ===
         DEFAULT_ACCOUNT_FACTORY_V0_7
@@ -88,7 +90,6 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
             .optional(),
           useSmartAccount: z.boolean(),
           sponsorGas: z.boolean(),
-          chainIds: z.array(z.number()),
           accountFactoryType: z.enum(["v0.6", "v0.7", "custom"]),
           customAccountFactoryAddress: z.string().optional(),
         })
@@ -97,8 +98,7 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
             if (
               data.useSmartAccount &&
               data.customAccountFactoryAddress &&
-              (!isAddress(data.customAccountFactoryAddress) ||
-                !data.customAccountFactoryAddress)
+              !isAddress(data.customAccountFactoryAddress)
             ) {
               return false;
             }
@@ -109,18 +109,6 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
             path: ["customAccountFactoryAddress"],
           },
         )
-        .refine(
-          (data) => {
-            if (data.useSmartAccount && data.chainIds.length === 0) {
-              return false;
-            }
-            return true;
-          },
-          {
-            message: "Please select at least one chain ID",
-            path: ["chainIds"],
-          },
-        )
         .refine(
           (data) => {
             if (data.useCustomAuth && !data.customAuthEndpoint) {
@@ -151,6 +139,17 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
     },
   });
 
+  const switchChain = useSwitchActiveWalletChain();
+  const currentChain = useActiveWalletChain();
+  if (
+    ecosystem.smartAccountOptions?.defaultChainId &&
+    currentChain &&
+    currentChain.id !== ecosystem.smartAccountOptions?.defaultChainId
+  ) {
+    const chainId = ecosystem.smartAccountOptions?.defaultChainId;
+    switchChain(getCachedChain(chainId));
+  }
+
   const onSubmit = (data: AuthOptionsFormData) => {
     let customAuthOptions: Ecosystem["customAuthOptions"] | null = null;
     if (data.useCustomAuth && data.customAuthEndpoint) {
@@ -180,12 +179,22 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
           accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_7;
           break;
         case "custom":
+          if (!data.customAccountFactoryAddress) {
+            toast.error("Please enter a custom account factory address");
+            return;
+          }
           accountFactoryAddress = data.customAccountFactoryAddress;
           break;
       }
 
+      if (!currentChain?.id) {
+        toast.error("Please select a default chain ID");
+        return;
+      }
       smartAccountOptions = {
-        chainIds: data.chainIds,
+        defaultChainId: currentChain?.id,
+        chainIds: [], // TODO: remove once backend is updated
+
         sponsorGas: data.sponsorGas,
         accountFactoryAddress,
       };
@@ -443,42 +452,25 @@ export function AuthOptionsForm({ ecosystem }: { ecosystem: Ecosystem }) {
                 )}
               />
 
-              <FormField
-                control={form.control}
-                name="chainIds"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Allowed Chain Ids</FormLabel>
-                    <div className="flex flex-col">
-                      <MultiNetworkSelector
-                        selectedChainIds={field.value}
-                        onChange={field.onChange}
-                      />
-                    </div>
-                    <FormDescription>
-                      Select which blockchain networks will be supported by the
-                      smart account. The first value will be the chain that
-                      users are connected to by default when logging into the
-                      <a
-                        href={`https://${ecosystem.slug}.ecosystem.thirdweb.com`}
-                        className="text-link-foreground"
-                        target="_blank"
-                        rel="noreferrer"
-                      >
-                        ecosystem homepage
-                      </a>
-                      .
-                    </FormDescription>
-                    <FormErrorMessage>
-                      {
-                        form.getFieldState("chainIds", form.formState).error
-                          ?.message
-                      }
-                    </FormErrorMessage>
-                  </FormItem>
-                )}
-              />
-
+              <FormItem>
+                <FormLabel>Default Chain ID</FormLabel>
+                <FormControl>
+                  <NetworkSelectorButton />
+                </FormControl>
+                <FormDescription>
+                  This will be the chain ID the smart account will be
+                  initialized to on your{" "}
+                  <a
+                    href={`https://${ecosystem.slug}.ecosystem.thirdweb.com`}
+                    className="text-link-foreground"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    ecosystem page
+                  </a>
+                  .
+                </FormDescription>
+              </FormItem>
               <FormField
                 control={form.control}
                 name="accountFactoryType"
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/types.ts b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/types.ts
@@ -36,7 +36,8 @@ export type Ecosystem = {
     };
   } | null;
   smartAccountOptions?: {
-    chainIds: number[];
+    defaultChainId: number;
+    chainIds: number[]; //todo ecosystem: remove this
     sponsorGas: boolean;
     accountFactoryAddress: string;
   } | null;
diff --git a/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts b/packages/thirdweb/src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts
@@ -13,7 +13,7 @@ type EcosystemOptions = {
 };
 
 type SmartAccountOptions = {
-  chainIds: number[];
+  defaultChainId: number;
   sponsorGas: boolean;
   accountFactoryAddress: string;
 };
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.test.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.test.ts
@@ -100,7 +100,7 @@ describe("createInAppWallet", () => {
   it("should handle ecosystem wallet connection with smart account settings", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
       smartAccountOptions: {
-        chainIds: [mockChain.id],
+        defaultChainId: mockChain.id,
         sponsorGas: true,
         accountFactoryAddress: "0x456",
       },
@@ -143,7 +143,7 @@ describe("createInAppWallet", () => {
   it("should handle ecosystem wallet connection with smart account settings even when no chain is set", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
       smartAccountOptions: {
-        chainIds: [mockChain.id],
+        defaultChainId: mockChain.id,
         sponsorGas: true,
         accountFactoryAddress: "0x456",
       },
@@ -185,7 +185,7 @@ describe("createInAppWallet", () => {
   it("should handle ecosystem wallet auto connection with smart account settings", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
       smartAccountOptions: {
-        chainIds: [mockChain.id],
+        defaultChainId: mockChain.id,
         sponsorGas: true,
         accountFactoryAddress: "0x456",
       },
@@ -229,7 +229,7 @@ describe("createInAppWallet", () => {
   it("should handle ecosystem wallet auto connection with smart account settings even when no chain is set", async () => {
     vi.mocked(getEcosystemInfo).mockResolvedValue({
       smartAccountOptions: {
-        chainIds: [mockChain.id],
+        defaultChainId: mockChain.id,
         sponsorGas: true,
         accountFactoryAddress: "0x456",
       },
@@ -267,68 +267,4 @@ describe("createInAppWallet", () => {
       expect.any(Object),
     );
   });
-
-  it("should throw error for unsupported chain in ecosystem", async () => {
-    const { getEcosystemInfo } = await import(
-      "../../../ecosystem/get-ecosystem-wallet-auth-options.js"
-    );
-
-    vi.mocked(getEcosystemInfo).mockResolvedValue({
-      smartAccountOptions: {
-        chainIds: [1],
-        sponsorGas: true,
-        accountFactoryAddress: "0x456",
-      },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
-    });
-
-    const wallet = createInAppWallet({
-      connectorFactory: mockConnectorFactory,
-      ecosystem: { id: "ecosystem.test-ecosystem" },
-    });
-
-    await expect(
-      wallet.connect({
-        client: mockClient,
-        chain: mockChain,
-        strategy: "email",
-        email: "",
-        verificationCode: "",
-      }),
-    ).rejects.toThrow(
-      `Chain ID ${mockChain.id} is not supported for ecosystem smart accounts.`,
-    );
-  });
-  it("should throw error for unsupported chain in ecosystem when auto-connecting", async () => {
-    const { getEcosystemInfo } = await import(
-      "../../../ecosystem/get-ecosystem-wallet-auth-options.js"
-    );
-
-    vi.mocked(getEcosystemInfo).mockResolvedValue({
-      smartAccountOptions: {
-        chainIds: [1],
-        sponsorGas: true,
-        accountFactoryAddress: "0x456",
-      },
-      authOptions: [],
-      name: "hello world",
-      slug: "test-ecosystem",
-    });
-
-    const wallet = createInAppWallet({
-      connectorFactory: mockConnectorFactory,
-      ecosystem: { id: "ecosystem.test-ecosystem" },
-    });
-
-    await expect(
-      wallet.autoConnect({
-        client: mockClient,
-        chain: mockChain,
-      }),
-    ).rejects.toThrow(
-      `Chain ID ${mockChain.id} is not supported for ecosystem smart accounts.`,
-    );
-  });
 });
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/in-app-core.ts
@@ -77,8 +77,7 @@ export function createInAppWallet(args: {
         const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
         const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
         if (smartAccountOptions) {
-          const defaultChainId =
-            ecosystemOptions.smartAccountOptions.chainIds?.[0];
+          const { defaultChainId } = ecosystemOptions.smartAccountOptions;
           if (!defaultChainId) {
             throw new Error(
               "No default chain ID found for ecosystem smart accounts. Please reach out to the ecosystem owner.",
@@ -87,16 +86,6 @@ export function createInAppWallet(args: {
           const preferredChain =
             options.chain ?? getCachedChain(defaultChainId);
 
-          if (
-            !ecosystemOptions.smartAccountOptions.chainIds?.includes(
-              preferredChain?.id,
-            )
-          ) {
-            throw new Error(
-              `Chain ID ${preferredChain.id} is not supported for ecosystem smart accounts.`,
-            );
-          }
-
           createOptions = {
             ...createOptions,
             smartAccount: {
@@ -140,8 +129,7 @@ export function createInAppWallet(args: {
         const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
         const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
         if (smartAccountOptions) {
-          const defaultChainId =
-            ecosystemOptions.smartAccountOptions.chainIds?.[0];
+          const { defaultChainId } = ecosystemOptions.smartAccountOptions;
           if (!defaultChainId) {
             throw new Error(
               "No default chain ID found for ecosystem smart accounts. Please reach out to the ecosystem owner.",
@@ -150,16 +138,6 @@ export function createInAppWallet(args: {
           const preferredChain =
             options.chain ?? getCachedChain(defaultChainId);
 
-          if (
-            !ecosystemOptions.smartAccountOptions.chainIds?.includes(
-              preferredChain?.id,
-            )
-          ) {
-            throw new Error(
-              `Chain ID ${preferredChain.id} is not supported for ecosystem smart accounts.`,
-            );
-          }
-
           createOptions = {
             ...createOptions,
             smartAccount: {
