Merge branch 'main' into origin/nir/depracate-pages

MananTank · web-flow · commit 7130592a0ec1 · 2025-03-06T17:28:33.000+05:30
diff --git a/.changeset/slick-eyes-reply.md b/.changeset/slick-eyes-reply.md
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/page.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/page.tsx
@@ -28,7 +28,7 @@ export default async function Page(props: {
   }
 
   const [ecosystem, team] = await Promise.all([
-    fetchEcosystem(params.slug, authToken),
+    fetchEcosystem(params.slug, authToken, params.team_slug),
     getTeamBySlug(params.team_slug),
   ]);
 
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/EcosystemSlugLayout.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/EcosystemSlugLayout.tsx
@@ -10,7 +10,7 @@ export async function EcosystemLayoutSlug({
   ecosystemLayoutPath,
 }: {
   children: React.ReactNode;
-  params: { slug: string };
+  params: { slug: string; team_slug: string };
   ecosystemLayoutPath: string;
 }) {
   const authToken = await getAuthToken();
@@ -19,7 +19,11 @@ export async function EcosystemLayoutSlug({
     redirect(ecosystemLayoutPath);
   }
 
-  const ecosystem = await fetchEcosystem(params.slug, authToken);
+  const ecosystem = await fetchEcosystem(
+    params.slug,
+    authToken,
+    params.team_slug,
+  );
 
   if (!ecosystem) {
     redirect(ecosystemLayoutPath);
@@ -30,6 +34,7 @@ export async function EcosystemLayoutSlug({
       <EcosystemHeader
         ecosystem={ecosystem}
         ecosystemLayoutPath={ecosystemLayoutPath}
+        teamIdOrSlug={params.team_slug}
       />
 
       <SidebarLayout
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/ecosystem-header.client.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/components/ecosystem-header.client.tsx
@@ -62,8 +62,11 @@ function EcosystemAlertBanner({ ecosystem }: { ecosystem: Ecosystem }) {
 function EcosystemSelect(props: {
   ecosystem: Ecosystem;
   ecosystemLayoutPath: string;
+  teamIdOrSlug: string;
 }) {
-  const { data: ecosystems, isPending } = useEcosystemList();
+  const { data: ecosystems, isPending } = useEcosystemList({
+    teamIdOrSlug: props.teamIdOrSlug,
+  });
 
   return isPending ? (
     <Skeleton className="h-10 w-full md:w-[160px]" />
@@ -109,8 +112,10 @@ function EcosystemSelect(props: {
 export function EcosystemHeader(props: {
   ecosystem: Ecosystem;
   ecosystemLayoutPath: string;
+  teamIdOrSlug: string;
 }) {
   const { data: fetchedEcosystem } = useEcosystem({
+    teamIdOrSlug: props.teamIdOrSlug,
     slug: props.ecosystem.slug,
     refetchInterval:
       props.ecosystem.status === "requested"
@@ -192,6 +197,7 @@ export function EcosystemHeader(props: {
               <EcosystemSelect
                 ecosystem={ecosystem}
                 ecosystemLayoutPath={props.ecosystemLayoutPath}
+                teamIdOrSlug={props.teamIdOrSlug}
               />
             </div>
           </div>
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/EcosystemPermissionsPage.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/EcosystemPermissionsPage.tsx
@@ -7,8 +7,11 @@ import { IntegrationPermissionsSection } from "../server/integration-permissions
 export function EcosystemPermissionsPage({
   params,
   authToken,
-}: { params: { slug: string }; authToken: string }) {
-  const { data: ecosystem } = useEcosystem({ slug: params.slug });
+}: { params: { slug: string; team_slug: string }; authToken: string }) {
+  const { data: ecosystem } = useEcosystem({
+    slug: params.slug,
+    teamIdOrSlug: params.team_slug,
+  });
 
   return (
     <div className="flex flex-col gap-8">
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-ecosystem.ts b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/hooks/use-ecosystem.ts
@@ -3,21 +3,23 @@ import { useQuery } from "@tanstack/react-query";
 import type { Ecosystem } from "../../../types";
 
 export function useEcosystem({
+  teamIdOrSlug,
   slug,
   refetchInterval,
   refetchOnWindowFocus,
   initialData,
 }: {
+  teamIdOrSlug: string;
   slug: string;
   refetchInterval?: number;
   refetchOnWindowFocus?: boolean;
   initialData?: Ecosystem;
 }) {
   return useQuery({
-    queryKey: ["ecosystems", slug],
+    queryKey: ["ecosystems", teamIdOrSlug, slug],
     queryFn: async () => {
       const res = await apiServerProxy({
-        pathname: `/v1/ecosystem-wallet/${slug}`,
+        pathname: `/v1/teams/${teamIdOrSlug}/ecosystem-wallet/${slug}`,
         method: "GET",
       });
 
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/hooks/use-ecosystem-list.ts b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/hooks/use-ecosystem-list.ts
@@ -3,13 +3,17 @@ import { useQuery } from "@tanstack/react-query";
 import { useActiveAccount } from "thirdweb/react";
 import type { Ecosystem } from "../types";
 
-export function useEcosystemList() {
+export function useEcosystemList({
+  teamIdOrSlug,
+}: {
+  teamIdOrSlug: string;
+}) {
   const address = useActiveAccount()?.address;
   return useQuery({
-    queryKey: ["ecosystems", address],
+    queryKey: ["ecosystems", teamIdOrSlug, address],
     queryFn: async () => {
       const res = await apiServerProxy({
-        pathname: "/v1/ecosystem-wallet/list",
+        pathname: `/v1/teams/${teamIdOrSlug}/ecosystem-wallet`,
         method: "GET",
       });
 
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/page.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/page.tsx
@@ -20,10 +20,12 @@ export default async function Page(props: {
     loginRedirect(ecosystemLayoutPath);
   }
 
-  const ecosystems = await fetchEcosystemList(authToken).catch((err) => {
-    console.error("failed to fetch ecosystems", err);
-    return [];
-  });
+  const ecosystems = await fetchEcosystemList(authToken, team_slug).catch(
+    (err) => {
+      console.error("failed to fetch ecosystems", err);
+      return [];
+    },
+  );
   if (ecosystems[0]) {
     redirect(`${ecosystemLayoutPath}/${ecosystems[0].slug}`);
   }
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/utils/fetchEcosystem.ts b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/utils/fetchEcosystem.ts
@@ -1,12 +1,19 @@
 import { API_SERVER_URL } from "@/constants/env";
 import type { Ecosystem } from "../types";
 
-export async function fetchEcosystem(slug: string, authToken: string) {
-  const res = await fetch(`${API_SERVER_URL}/v1/ecosystem-wallet/${slug}`, {
-    headers: {
-      Authorization: `Bearer ${authToken}`,
+export async function fetchEcosystem(
+  slug: string,
+  authToken: string,
+  teamIdOrSlug: string,
+) {
+  const res = await fetch(
+    `${API_SERVER_URL}/v1/teams/${teamIdOrSlug}/ecosystem-wallet/${slug}`,
+    {
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+      },
     },
-  });
+  );
   if (!res.ok) {
     const data = await res.json();
     console.error(data);
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/utils/fetchEcosystemList.ts b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/utils/fetchEcosystemList.ts
@@ -1,12 +1,18 @@
 import { API_SERVER_URL } from "@/constants/env";
 import type { Ecosystem } from "../types";
 
-export async function fetchEcosystemList(authToken: string) {
-  const res = await fetch(`${API_SERVER_URL}/v1/ecosystem-wallet/list`, {
-    headers: {
-      Authorization: `Bearer ${authToken}`,
+export async function fetchEcosystemList(
+  authToken: string,
+  teamIdOrSlug: string,
+) {
+  const res = await fetch(
+    `${API_SERVER_URL}/v1/teams/${teamIdOrSlug}/ecosystem-wallet`,
+    {
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+      },
     },
-  });
+  );
 
   if (!res.ok) {
     const data = await res.json();
diff --git a/apps/dashboard/src/components/settings/ApiKeys/Alerts.tsx b/apps/dashboard/src/components/settings/ApiKeys/Alerts.tsx
@@ -44,11 +44,10 @@ export const SmartWalletsBillingAlert = ({
           <AlertTitle>Account Abstraction on Mainnet</AlertTitle>
           <AlertDescription>
             <Text as="span" pr={1}>
-              You&apos;ve enabled Account Abstraction for one of your API keys
-              and haven&apos;t added a payment method.
+              You&apos;ve enabled Account Abstraction for one of your API keys.
               <br />
-              To use them on Mainnet,
-            </Text>
+              To enable AA on mainnet chains,
+            </Text>{" "}
             <TrackedLink
               href="/team/~/~/settings/billing"
               category="api_keys"
@@ -57,7 +56,7 @@ export const SmartWalletsBillingAlert = ({
               color="blue.500"
             >
               <Text as="span" color="blue.500">
-                add a payment method.
+                subscribe to a billing plan.
               </Text>
             </TrackedLink>
           </AlertDescription>
diff --git a/apps/portal/src/app/connect/account-abstraction/infrastructure/page.mdx b/apps/portal/src/app/connect/account-abstraction/infrastructure/page.mdx
@@ -27,6 +27,42 @@ With a thirdweb API key, you get access to bundler and paymaster infrastructure
 
 To support a chain not listed, [contact us](https://thirdweb.com/contact-us).
 
+## Using Paymaster & Bundler URL
+
+To use the Paymaster & Bundler URL for thirdweb, you can follow the guide below:
+
+### URL Pattern
+
+The URL pattern is predictable for all chains and is used for both paymaster and bundler operations:
+
+```
+https://<chain_id>.bundler.thirdweb.com/v2/<thirdweb-client-id>
+```
+
+Replace `<chain_id>` with the appropriate chain ID and `<thirdweb-client-id>` with your thirdweb client ID.
+
+### Client ID in Header
+
+You can also pass the client ID via the header:
+
+```
+x-client-id: <your_thirdweb_client_id>
+```
+
+### Frontend Calls
+
+For frontend calls, the calling domain needs to be allowlisted. This can be done from the thirdweb dashboard in the API key settings.
+
+### Backend Usage
+
+For backend usage, the secret key is required as a header, and the client ID can be omitted:
+
+```
+x-secret-key: <your_thirdweb_secret_key>
+```
+
+Make sure to replace the placeholders with your actual values. This guide will help you set up and use Paymaster & Bundler URLs effectively with thirdweb.
+
 ## Using a Custom Bundler
 
 Smart accounts are free to use with your own account abstraction infrastructure. To use your own paymaster & bundler,
diff --git a/packages/service-utils/CHANGELOG.md b/packages/service-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @thirdweb-dev/service-utils
 
+## 0.8.13
+
+### Patch Changes
+
+- [#6416](https://github.com/thirdweb-dev/js/pull/6416) [`44bb003`](https://github.com/thirdweb-dev/js/commit/44bb0034a69334f05cfa14132d56e354536e77ff) Thanks [@arcoraven](https://github.com/arcoraven)! - [service-utils] Add "pay" as a usage source
+
 ## 0.8.12
 
 ### Patch Changes
diff --git a/packages/service-utils/package.json b/packages/service-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/service-utils",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/packages/thirdweb/CHANGELOG.md b/packages/thirdweb/CHANGELOG.md
@@ -1,5 +1,11 @@
 # thirdweb
 
+## 5.90.3
+
+### Patch Changes
+
+- [#6424](https://github.com/thirdweb-dev/js/pull/6424) [`38ae2d3`](https://github.com/thirdweb-dev/js/commit/38ae2d3c6b7d5052974e8a61333997699230ad45) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Expose getUserOpHash utility function
+
 ## 5.90.2
 
 ### Patch Changes
diff --git a/packages/thirdweb/package.json b/packages/thirdweb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.90.2",
+  "version": "5.90.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
diff --git a/packages/thirdweb/src/exports/wallets/smart.ts b/packages/thirdweb/src/exports/wallets/smart.ts
@@ -5,6 +5,7 @@ export {
   createUnsignedUserOp,
   signUserOp,
   createAndSignUserOp,
+  getUserOpHash,
 } from "../../wallets/smart/lib/userop.js";
 
 export {
diff --git a/packages/thirdweb/src/wallets/in-app/core/actions/sign-message.enclave.ts b/packages/thirdweb/src/wallets/in-app/core/actions/sign-message.enclave.ts
@@ -6,13 +6,15 @@ import type { ClientScopedStorage } from "../authentication/client-scoped-storag
 
 export async function signMessage({
   client,
-  payload: { message, isRaw },
+  payload: { message, isRaw, originalMessage, chainId },
   storage,
 }: {
   client: ThirdwebClient;
   payload: {
     message: string;
     isRaw: boolean;
+    originalMessage?: string;
+    chainId?: number;
   };
   storage: ClientScopedStorage;
 }) {
@@ -37,6 +39,8 @@ export async function signMessage({
         messagePayload: {
           message,
           isRaw,
+          originalMessage,
+          chainId,
         },
       }),
     },
diff --git a/packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts b/packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts
@@ -217,17 +217,19 @@ export class EnclaveWallet implements IWebWallet {
 
         return { transactionHash };
       },
-      async signMessage({ message }) {
+      async signMessage({ message, originalMessage, chainId }) {
         const messagePayload = (() => {
           if (typeof message === "string") {
-            return { message, isRaw: false };
+            return { message, isRaw: false, originalMessage, chainId };
           }
           return {
             message:
               typeof message.raw === "string"
                 ? message.raw
                 : bytesToHex(message.raw),
             isRaw: true,
+            originalMessage,
+            chainId,
           };
         })();
 
diff --git a/packages/thirdweb/src/wallets/interfaces/wallet.ts b/packages/thirdweb/src/wallets/interfaces/wallet.ts
@@ -182,7 +182,15 @@ export type Account = {
    * const signature = await account.signMessage({ message: 'hello!' });
    * ```
    */
-  signMessage: ({ message }: { message: SignableMessage }) => Promise<Hex>;
+  signMessage: ({
+    message,
+    originalMessage,
+    chainId,
+  }: {
+    message: SignableMessage;
+    originalMessage?: string;
+    chainId?: number;
+  }) => Promise<Hex>;
   /**
    * Sign the given typed data and return the signature
    * @example
diff --git a/packages/thirdweb/src/wallets/smart/lib/userop.ts b/packages/thirdweb/src/wallets/smart/lib/userop.ts
diff --git a/packages/wagmi-adapter/CHANGELOG.md b/packages/wagmi-adapter/CHANGELOG.md
diff --git a/packages/wagmi-adapter/package.json b/packages/wagmi-adapter/package.json

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export default async function Page(props: {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`const [ecosystem, team] = await Promise.all([`
`31`		`- fetchEcosystem(params.slug, authToken),`
	`31`	`+ fetchEcosystem(params.slug, authToken, params.team_slug),`
`32`	`32`	`getTeamBySlug(params.team_slug),`
`33`	`33`	`]);`
`34`	`34`