Merge branch 'main' into feature/create-new-wallet-updates

Author: QSchlegel

package-lock.json

@@ -29,7 +29,7 @@
     "@meshsdk/core-cst": "^1.9.0-beta.77",
     "@meshsdk/react": "^1.9.0-beta.77",
     "@octokit/core": "^6.1.2",
-    "@prisma/client": "^6.4.1",
+    "@prisma/client": "^6.17.1",
     "@radix-ui/react-accordion": "^1.2.0",
     "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-collapsible": "^1.1.0",
@@ -111,7 +111,7 @@
     "postcss": "^8.4.39",
     "prettier": "^3.3.2",
     "prettier-plugin-tailwindcss": "^0.6.5",
-    "prisma": "^6.4.1",
+    "prisma": "^6.17.1",
     "tailwindcss": "^3.4.3",
     "ts-jest": "^29.4.4",
     "typescript": "^5.5.3"

package.json

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Wallet" ADD COLUMN     "migrationTargetWalletId" TEXT;
+

prisma/migrations/20251017112523_add_migration_target_wallet_id/migration.sql

@@ -0,0 +1,45 @@
+-- CreateTable
+CREATE TABLE "Proxy" (
+    "id" TEXT NOT NULL,
+    "walletId" TEXT,
+    "proxyAddress" TEXT NOT NULL,
+    "authTokenId" TEXT NOT NULL,
+    "paramUtxo" TEXT NOT NULL,
+    "description" TEXT,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "userId" TEXT,
+
+    CONSTRAINT "Proxy_pkey" PRIMARY KEY ("id")
+);
+
+
+-- CreateTable
+CREATE TABLE "Migration" (
+    "id" TEXT NOT NULL,
+    "originalWalletId" TEXT NOT NULL,
+    "newWalletId" TEXT,
+    "ownerAddress" TEXT NOT NULL,
+    "currentStep" INTEGER NOT NULL DEFAULT 0,
+    "status" TEXT NOT NULL DEFAULT 'pending',
+    "migrationData" JSONB,
+    "errorMessage" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "completedAt" TIMESTAMP(3),
+
+    CONSTRAINT "Migration_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "Migration_ownerAddress_idx" ON "Migration"("ownerAddress");
+
+-- CreateIndex
+CREATE INDEX "Migration_originalWalletId_idx" ON "Migration"("originalWalletId");
+
+-- CreateIndex
+CREATE INDEX "Migration_status_idx" ON "Migration"("status");
+
+-- CreateIndex
+CREATE INDEX "Migration_createdAt_idx" ON "Migration"("createdAt");

prisma/migrations/20251028145553_add_missing_schema_changes/migration.sql

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
 # It should be added in your version-control system (e.g., Git)
-provider = "postgresql"
+provider = "postgresql"

prisma/migrations/migration_lock.toml

@@ -1,6 +1,3 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
 generator client {
   provider = "prisma-client-js"
 }
@@ -20,21 +17,21 @@ model User {
 }
 
 model Wallet {
-  id                  String   @id @default(cuid())
-  name                String
-  description         String?
-  signersAddresses    String[]
-  signersStakeKeys    String[]
-  signersDRepKeys     String[]
-  signersDescriptions String[]
-  numRequiredSigners  Int?
-  verified            String[]
-  scriptCbor          String
-  stakeCredentialHash String?
-  type                String
-  isArchived          Boolean  @default(false)
-  clarityApiKey       String?
-  rawImportBodies     Json?
+  id                      String   @id @default(cuid())
+  name                    String
+  description             String?
+  signersAddresses        String[]
+  signersStakeKeys        String[]
+  signersDRepKeys         String[]
+  signersDescriptions     String[]
+  numRequiredSigners      Int?
+  verified                String[]
+  scriptCbor              String
+  stakeCredentialHash     String?
+  type                    String
+  isArchived              Boolean  @default(false)
+  clarityApiKey           String?
+  migrationTargetWalletId String?
 }
 
 model Transaction {
@@ -103,6 +100,19 @@ model Ballot {
   createdAt        DateTime @default(now())
 }
 
+model Proxy {
+  id           String   @id @default(cuid())
+  walletId     String?
+  proxyAddress String
+  authTokenId  String
+  paramUtxo    String
+  description  String?
+  isActive     Boolean  @default(true)
+  createdAt    DateTime @default(now())
+  updatedAt    DateTime @updatedAt
+  userId       String?
+}
+
 model BalanceSnapshot {
   id            String   @id @default(cuid())
   walletId      String
@@ -113,3 +123,23 @@ model BalanceSnapshot {
   isArchived    Boolean
   snapshotDate  DateTime @default(now())
 }
+
+model Migration {
+  id               String    @id @default(cuid())
+  originalWalletId String // The wallet being migrated from
+  newWalletId      String? // The new wallet being created (null until created)
+  ownerAddress     String // The user who initiated the migration
+  currentStep      Int       @default(0) // 0=pre-checks, 1=create wallet, 2=proxy setup, 3=transfer funds, 4=complete
+  status           String    @default("pending") // pending, in_progress, completed, failed, cancelled
+  migrationData    Json? // Store any additional migration-specific data
+  errorMessage     String? // Store error details if migration fails
+  createdAt        DateTime  @default(now())
+  updatedAt        DateTime  @updatedAt
+  completedAt      DateTime?
+
+  // Indexes for efficient querying
+  @@index([ownerAddress])
+  @@index([originalWalletId])
+  @@index([status])
+  @@index([createdAt])
+}

prisma/schema.prisma

@@ -161,6 +161,19 @@ export default function RootLayout({
           return;
         }
 
+        // Handle connection errors with retry logic
+        if (error instanceof Error && (
+          error.message.includes("Could not establish connection") ||
+          error.message.includes("Receiving end does not exist") ||
+          error.message.includes("Cannot read properties of undefined")
+        )) {
+          console.log("Browser extension connection error detected, retrying in 2 seconds...");
+          setTimeout(() => {
+            window.location.reload();
+          }, 2000);
+          return;
+        }
+        
         // For other errors, don't throw to prevent app crash
         // The user can retry by reconnecting their wallet
       }
@@ -296,6 +309,7 @@ export default function RootLayout({
           </div>
         </header>
 
+
         <main className="relative flex flex-1 flex-col gap-4 overflow-y-auto overflow-x-hidden p-4 md:p-8">
           <WalletErrorBoundary 
             fallback={

src/components/common/overall-layout/layout.tsx

@@ -11,6 +11,7 @@ import { Asset } from "@meshsdk/core";
 import { getDRepIds } from "@meshsdk/core-cst";
 import { BlockfrostDrepInfo } from "@/types/governance";
 import { Button } from "@/components/ui/button";
+import { useProxyActions } from "@/lib/zustand/proxy";
 
 interface WalletDataLoaderWrapperProps {
   mode: "button" | "menu-item";
@@ -47,6 +48,7 @@ export default function WalletDataLoaderWrapper({
   const setWalletAssetMetadata = useWalletsStore(
     (state) => state.setWalletAssetMetadata,
   );
+  const { fetchAllProxyData, setProxies } = useProxyActions();
 
   const setDrepInfo = useWalletsStore((state) => state.setDrepInfo);
 
@@ -179,6 +181,35 @@ export default function WalletDataLoaderWrapper({
     }
   }
 
+  async function fetchProxyData() {
+    if (appWallet?.id && appWallet?.scriptCbor) {     
+      try {
+        // Get proxies from API
+        const proxies = await ctx.proxy.getProxiesByUserOrWallet.fetch({
+          walletId: appWallet.id,
+        });
+
+        // First, add proxies to the store
+        setProxies(appWallet.id, proxies);
+
+        // Fetch all proxy data in parallel using the new batch function
+        if (proxies.length > 0) {
+          console.log(`WalletDataLoaderWrapper: Fetching data for ${proxies.length} proxies in parallel`);
+          await fetchAllProxyData(
+            appWallet.id, 
+            proxies, 
+            appWallet.scriptCbor, 
+            network.toString(),
+            false // Use cache to avoid duplicate requests
+          );
+          console.log("WalletDataLoaderWrapper: Successfully fetched all proxy data");
+        }
+      } catch (error) {
+        console.error("WalletDataLoaderWrapper: Error fetching proxy data:", error);
+      }
+    }
+  }
+
   async function refreshWallet() {
     if (fetchingTransactions.current) return;
 
@@ -188,8 +219,11 @@ export default function WalletDataLoaderWrapper({
     await getTransactionsOnChain();
     await getWalletAssets();
     await getDRepInfo();
+    await fetchProxyData(); // Fetch proxy data
     void ctx.transaction.getPendingTransactions.invalidate();
     void ctx.transaction.getAllTransactions.invalidate();
+    // Also refresh proxy data
+    void ctx.proxy.getProxiesByUserOrWallet.invalidate();
     setRandomState();
     setLoading(false);
     fetchingTransactions.current = false;

src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx

@@ -0,0 +1,111 @@
+import { useEffect } from "react";
+import useAppWallet from "@/hooks/useAppWallet";
+import { useProxyData, useProxyActions } from "@/lib/zustand/proxy";
+import { useSiteStore } from "@/lib/zustand/site";
+import { api } from "@/utils/api";
+
+export default function ProxyDataLoader() {
+  const { appWallet } = useAppWallet();
+  const network = useSiteStore((state) => state.network);
+  const { proxies } = useProxyData(appWallet?.id);
+  const { 
+    setProxies, 
+    fetchProxyBalance, 
+    fetchProxyDrepInfo,
+    fetchProxyDelegatorsInfo,
+    clearProxyData 
+  } = useProxyActions();
+
+  
+
+  // Get proxies from API
+  const { data: apiProxies, refetch: refetchProxies } = api.proxy.getProxiesByUserOrWallet.useQuery(
+    { 
+      walletId: appWallet?.id ?? undefined,
+    },
+    { 
+      enabled: !!appWallet?.id,
+      refetchOnWindowFocus: false,
+      staleTime: 30000, // 30 seconds
+    }
+  );
+
+  // Update store when API data changes
+  useEffect(() => {
+    if (apiProxies && appWallet?.id) {
+      const proxyData = apiProxies.map(proxy => ({
+        id: proxy.id,
+        proxyAddress: proxy.proxyAddress,
+        authTokenId: proxy.authTokenId,
+        paramUtxo: proxy.paramUtxo,
+        description: proxy.description,
+        isActive: proxy.isActive,
+        createdAt: new Date(proxy.createdAt),
+        lastUpdated: Date.now(),
+      }));
+      
+      setProxies(appWallet.id, proxyData);
+    }
+  }, [apiProxies, appWallet?.id, setProxies]);
+
+  // Fetch additional data for each proxy
+  useEffect(() => {
+    if (proxies.length > 0 && appWallet?.id && appWallet?.scriptCbor) {
+      void (async () => {
+        for (const proxy of proxies) {
+          // Only fetch if we don't have recent data (older than 5 minutes)
+          const isStale = !proxy.lastUpdated || (Date.now() - proxy.lastUpdated) > 5 * 60 * 1000;
+          if (isStale) {
+            try {
+              await fetchProxyBalance(appWallet.id, proxy.id, proxy.proxyAddress, network.toString());
+              await fetchProxyDrepInfo(
+                appWallet.id,
+                proxy.id,
+                proxy.proxyAddress,
+                proxy.authTokenId,
+                appWallet.scriptCbor,
+                network.toString(),
+                proxy.paramUtxo,
+                true,
+              );
+              await fetchProxyDelegatorsInfo(
+                appWallet.id,
+                proxy.id,
+                proxy.proxyAddress,
+                proxy.authTokenId,
+                appWallet.scriptCbor,
+                network.toString(),
+                proxy.paramUtxo,
+                true,
+              );
+            } catch (error) {
+              console.error(`Error fetching data for proxy ${proxy.id}:`, error);
+            }
+          }
+        }
+      })();
+    }
+  }, [proxies, appWallet?.id, appWallet?.scriptCbor, network, fetchProxyBalance, fetchProxyDrepInfo, fetchProxyDelegatorsInfo]);
+
+  // Clear proxy data when wallet changes
+  useEffect(() => {
+    return () => {
+      if (appWallet?.id) {
+        clearProxyData(appWallet.id);
+      }
+    };
+  }, [appWallet?.id, clearProxyData]);
+
+  // Expose refetch function for manual refresh
+  useEffect(() => {
+    // Store refetch function in window for global access if needed
+    if (typeof window !== 'undefined') {
+      const w = window as Window & { refetchProxyData?: () => void };
+      w.refetchProxyData = () => {
+        void refetchProxies();
+      };
+    }
+  }, [refetchProxies]);
+
+  return null; // This is a data loader component, no UI
+}