cache SA, filter rotated access tokens

joaquim-verges · joaquim-verges · commit 634ab5d14a40 · 2025-05-03T00:37:04.000+12:00
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/components/ProjectSidebarLayout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/components/ProjectSidebarLayout.tsx
@@ -12,6 +12,7 @@ import { EngineIcon } from "../../../../(dashboard)/(chain)/components/server/ic
 import { InsightIcon } from "../../../../(dashboard)/(chain)/components/server/icons/InsightIcon";
 import { PayIcon } from "../../../../(dashboard)/(chain)/components/server/icons/PayIcon";
 import { SmartAccountIcon } from "../../../../(dashboard)/(chain)/components/server/icons/SmartAccountIcon";
+import { Badge } from "../../../../../../@/components/ui/badge";
 import { NebulaIcon } from "../../../../../nebula-app/(app)/icons/NebulaIcon";
 
 export function ProjectSidebarLayout(props: {
@@ -62,7 +63,11 @@ export function ProjectSidebarLayout(props: {
         },
         {
           href: `${layoutPath}/engine`,
-          label: "Engine",
+          label: (
+            <span className="flex items-center gap-2">
+              Engine <Badge>New</Badge>
+            </span>
+          ),
           icon: EngineIcon,
           tracking: tracking("engine"),
         },
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/analytics/analytics-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/analytics/analytics-page.tsx
@@ -12,14 +12,14 @@ export function TransactionsAnalyticsPageContent(props: {
     interval?: string | undefined | string[];
   };
   project: Project;
-  hasTransactions: boolean;
+  showAnalytics: boolean;
   wallets?: Wallet[];
   teamSlug: string;
 }) {
   return (
     <ResponsiveSearchParamsProvider value={props.searchParams}>
       <div className="flex grow flex-col gap-6">
-        {props.hasTransactions && (
+        {props.showAnalytics && (
           <>
             <div className="flex justify-end">
               <TransactionAnalyticsFilter />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/analytics/ftux.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/analytics/ftux.client.tsx
@@ -15,6 +15,7 @@ interface Props {
   wallets: Wallet[];
   hasTransactions: boolean;
   teamSlug: string;
+  testTxWithWallet?: string | undefined;
 }
 
 export const EngineChecklist: React.FC<Props> = (props) => {
@@ -60,6 +61,7 @@ export const EngineChecklist: React.FC<Props> = (props) => {
           wallets={props.wallets}
           project={props.project}
           userAccessToken={userAccessToken}
+          teamSlug={props.teamSlug}
         />
       ),
       completed: props.hasTransactions,
@@ -76,6 +78,18 @@ export const EngineChecklist: React.FC<Props> = (props) => {
     props.teamSlug,
   ]);
 
+  if (props.testTxWithWallet) {
+    return (
+      <SendTestTransaction
+        wallets={props.wallets}
+        project={props.project}
+        userAccessToken={userAccessToken}
+        walletId={props.testTxWithWallet}
+        teamSlug={props.teamSlug}
+      />
+    );
+  }
+
   if (finalSteps.length === 1) {
     return null;
   }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/analytics/send-test-tx.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/analytics/send-test-tx.client.tsx
@@ -40,8 +40,10 @@ type FormValues = z.infer<typeof formSchema>;
 export function SendTestTransaction(props: {
   wallets?: Wallet[];
   project: Project;
+  teamSlug: string;
   userAccessToken?: string;
   expanded?: boolean;
+  walletId?: string;
 }) {
   const thirdwebClient = useThirdwebClient();
   const queryClient = useQueryClient();
@@ -52,7 +54,13 @@ export function SendTestTransaction(props: {
     resolver: zodResolver(formSchema),
     defaultValues: {
       accessToken: props.userAccessToken ?? "",
-      walletIndex: "0",
+      walletIndex:
+        props.wallets && props.walletId
+          ? props.wallets
+              .findIndex((w) => w.id === props.walletId)
+              ?.toString()
+              .replace("-1", "0")
+          : "0",
       chainId: 84532,
     },
   });
@@ -126,6 +134,9 @@ export function SendTestTransaction(props: {
   return (
     <div className="mt-3 w-full rounded-md border bg-background p-6">
       <form onSubmit={form.handleSubmit(onSubmit)}>
+        {props.walletId && (
+          <h3 className="mb-4 font-medium text-lg">Send a test transaction</h3>
+        )}
         <p className="flex items-center gap-2 text-sm text-warning-text">
           <LockIcon className="h-4 w-4" />
           Every wallet action requires your Vault access token.
@@ -182,7 +193,7 @@ export function SendTestTransaction(props: {
                       <div className="flex items-center gap-2">
                         <SmartAccountCell wallet={wallet} />
                         <span className="text-muted-foreground text-sm">
-                          {selectedWallet.metadata.label}
+                          {wallet.metadata.label}
                         </span>
                       </div>
                     </SelectItem>
@@ -251,10 +262,16 @@ export function SendTestTransaction(props: {
               variant="primary"
               className="w-full md:w-auto"
               onClick={() => {
-                router.refresh();
+                if (props.walletId) {
+                  router.replace(
+                    `/team/${props.teamSlug}/${props.project.slug}/engine/cloud`,
+                  );
+                } else {
+                  router.refresh();
+                }
               }}
             >
-              Complete Setup
+              {props.walletId ? "Close" : "Complete Setup"}
             </Button>
           )}
         </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/page.tsx
@@ -18,6 +18,7 @@ export default async function TransactionsAnalyticsPage(props: {
     from?: string | string[] | undefined;
     to?: string | string[] | undefined;
     interval?: string | string[] | undefined;
+    testTxWithWallet?: string | string[] | undefined;
   }>;
 }) {
   const [params, searchParams, authToken] = await Promise.all([
@@ -84,8 +85,9 @@ export default async function TransactionsAnalyticsPage(props: {
         hasTransactions={hasTransactions}
         project={project}
         wallets={wallets ?? []}
+        testTxWithWallet={searchParams.testTxWithWallet as string | undefined}
       />
-      {hasTransactions && (
+      {hasTransactions && !searchParams.testTxWithWallet && (
         <TransactionAnalyticsSummary
           initialData={initialData}
           teamId={project.teamId}
@@ -97,7 +99,7 @@ export default async function TransactionsAnalyticsPage(props: {
         teamSlug={params.team_slug}
         searchParams={searchParams}
         project={project}
-        hasTransactions={hasTransactions}
+        showAnalytics={hasTransactions && !searchParams.testTxWithWallet}
         wallets={wallets}
       />
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/server-wallets/components/create-server-wallet.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/server-wallets/components/create-server-wallet.client.tsx
@@ -15,6 +15,7 @@ import { createEoa } from "@thirdweb-dev/vault-sdk";
 import { Loader2, WalletIcon } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
+import { engineCloudProxy } from "../../../../../../../../../@/actions/proxies";
 import { initVaultClient } from "../../lib/vault.client";
 
 export default function CreateServerWallet(props: {
@@ -57,6 +58,22 @@ export default function CreateServerWallet(props: {
         throw new Error("Failed to create eoa");
       }
 
+      // no need to await this, it's not blocking
+      engineCloudProxy({
+        pathname: "/cache/smart-account",
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "x-team-id": props.project.teamId,
+          "x-client-id": props.project.publishableKey,
+        },
+        body: JSON.stringify({
+          signerAddress: eoa.data.address,
+        }),
+      }).catch((err) => {
+        console.warn("failed to cache server wallet", err);
+      });
+
       router.refresh();
       setModalOpen(false);
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/server-wallets/components/try-it-out.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/server-wallets/components/try-it-out.tsx
@@ -113,8 +113,7 @@ curl -X POST "${THIRDWEB_ENGINE_CLOUD_URL}/write/contract" \\
   -H "x-vault-access-token: <your-vault-access-token>" \\
   -d '{
     "executionOptions": {
-      "type": "AA",
-      "signerAddress": "<your-signer-address>",
+      "from": "<your-server-wallet-address>",
       "chainId": "84532"
     },
     "params": [
@@ -138,8 +137,7 @@ const response = await fetch(
     },
     body: JSON.stringify({
       "executionOptions": {
-        "type": "AA",
-        "signerAddress": "<your-signer-address>",
+        "from": "<your-server-wallet-address>",
         "chainId": "84532"
       },
       "params": [
@@ -165,8 +163,7 @@ headers = {
 }
 payload = {
     "executionOptions": {
-        "type": "AA",
-        "signerAddress": "<your-signer-address>",
+        "from": "<your-server-wallet-address>",
         "chainId": "84532"
     },
     "params": [
@@ -203,9 +200,8 @@ func main() {
 	
 	type RequestBody struct {
 		ExecutionOptions struct {
-			Type          string \`json:"type"\`
-			SignerAddress string \`json:"signerAddress"\`
-			ChainId       string \`json:"chainId"\`
+			From    string \`json:"from"\`
+			ChainId string \`json:"chainId"\`
 		} \`json:"executionOptions"\`
 		Params []Param \`json:"params"\`
 	}
@@ -219,8 +215,7 @@ func main() {
 			},
 		},
 	}
-	requestBody.ExecutionOptions.Type = "AA"
-	requestBody.ExecutionOptions.SignerAddress = "<your-signer-address>"
+	requestBody.ExecutionOptions.From = "<your-server-wallet-address>"
 	requestBody.ExecutionOptions.ChainId = "84532"
 	
 	jsonData, _ := json.Marshal(requestBody)
@@ -263,8 +258,7 @@ class Program
         {
             executionOptions = new
             {
-                type = "AA",
-                signerAddress = "<your-signer-address>",
+                from = "<your-server-wallet-address>",
                 chainId = "84532"
             },
             @params = new[]
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx
@@ -19,11 +19,14 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
 import { useQuery } from "@tanstack/react-query";
 import { formatDistanceToNowStrict } from "date-fns";
 import { format } from "date-fns/format";
+import { SendIcon } from "lucide-react";
 import { useState } from "react";
 import {
   DEFAULT_ACCOUNT_FACTORY_V0_7,
   predictSmartAccountAddress,
 } from "thirdweb/wallets/smart";
+import { Button } from "../../../../../../../../../@/components/ui/button";
+import { useDashboardRouter } from "../../../../../../../../../@/lib/DashboardRouter";
 import { useV5DashboardChain } from "../../../../../../../../../lib/v5-adapter";
 import CreateServerWallet from "../components/create-server-wallet.client";
 import type { Wallet } from "./types";
@@ -76,8 +79,9 @@ export function ServerWalletsTableUI({
             <TableRow>
               <TableHead>Address</TableHead>
               <TableHead>Label</TableHead>
-              <TableHead>Created At</TableHead>
-              <TableHead>Updated At</TableHead>
+              <TableHead className="text-right">Created At</TableHead>
+              <TableHead className="text-right">Updated At</TableHead>
+              <TableHead className="text-right">Send test tx</TableHead>
             </TableRow>
           </TableHeader>
           <TableBody>
@@ -98,12 +102,19 @@ export function ServerWalletsTableUI({
                     )}
                   </TableCell>
                   <TableCell>{wallet.metadata.label || "none"}</TableCell>
-                  <TableCell>
+                  <TableCell className="text-right">
                     <WalletDateCell date={wallet.createdAt} />
                   </TableCell>
-                  <TableCell>
+                  <TableCell className="text-right">
                     <WalletDateCell date={wallet.updatedAt} />
                   </TableCell>
+                  <TableCell className="flex justify-end">
+                    <SendTestTransaction
+                      wallet={wallet}
+                      project={project}
+                      teamSlug={teamSlug}
+                    />
+                  </TableCell>
                 </TableRow>
               ))
             )}
@@ -157,3 +168,24 @@ function WalletDateCell({ date }: { date: string }) {
     </ToolTipLabel>
   );
 }
+
+function SendTestTransaction(props: {
+  wallet: Wallet;
+  teamSlug: string;
+  project: Project;
+}) {
+  const router = useDashboardRouter();
+  return (
+    <Button
+      variant="secondary"
+      size="sm"
+      onClick={() => {
+        router.push(
+          `/team/${props.teamSlug}/${props.project.slug}/engine/cloud?testTxWithWallet=${props.wallet.id}`,
+        );
+      }}
+    >
+      <SendIcon className="size-4" />
+    </Button>
+  );
+}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/vault/components/list-access-tokens.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/engine/cloud/vault/components/list-access-tokens.client.tsx
@@ -143,7 +143,7 @@ export default function ListAccessTokens(props: {
               t.metadata?.purpose?.toString() !==
               SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,
           )
-          .filter((t) => !t.revokedAt),
+          .filter((t) => !t.revokedAt && !t.isRotated),
       };
       // Return stub data for now
     },

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ export default function ListAccessTokens(props: {`
`143`	`143`	`t.metadata?.purpose?.toString() !==`
`144`	`144`	`SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,`
`145`	`145`	`)`
`146`		`- .filter((t) => !t.revokedAt),`
	`146`	`+ .filter((t) => !t.revokedAt && !t.isRotated),`
`147`	`147`	`};`
`148`	`148`	`// Return stub data for now`
`149`	`149`	`},`