Wallet build improvements

Author: Andre-Diamond

src/pages/api/v1/aggregatedBalances/README.md

@@ -12,23 +12,28 @@ All endpoints require authentication using the `SNAPSHOT_AUTH_TOKEN` environment
 
 ### `/api/v1/aggregatedBalances/wallets`
 - **Method**: GET
-- **Purpose**: Returns all wallet information without fetching balances
+- **Purpose**: Returns all wallet information without fetching balances or building wallet objects
 - **Authentication**: Required (Bearer token)
 - **Response**: 
   ```json
   {
     "wallets": [
       {
         "walletId": "string",
-        "walletName": "string", 
+        "walletName": "string",
+        "description": "string|null",
         "signersAddresses": ["string"],
+        "signersStakeKeys": ["string"],
+        "signersDRepKeys": ["string"],
+        "signersDescriptions": ["string"],
         "numRequiredSigners": number,
-        "type": "string",
+        "verified": ["string"],
+        "scriptCbor": "string",
         "stakeCredentialHash": "string|null",
+        "type": "string",
         "isArchived": boolean,
-        "network": number,
-        "paymentAddress": "string",
-        "stakeableAddress": "string"
+        "clarityApiKey": "string|null",
+        "network": number
       }
     ],
     "walletCount": number,
@@ -39,7 +44,7 @@ All endpoints require authentication using the `SNAPSHOT_AUTH_TOKEN` environment
 
 ### `/api/v1/aggregatedBalances/balance`
 - **Method**: GET
-- **Purpose**: Fetches balance for a single wallet
+- **Purpose**: Fetches balance for a single wallet (builds wallet and generates addresses internally)
 - **Authentication**: Required (Bearer token)
 - **Query Parameters**: 
   - `walletId` (required) - Wallet ID
@@ -50,8 +55,6 @@ All endpoints require authentication using the `SNAPSHOT_AUTH_TOKEN` environment
   - `stakeCredentialHash` (optional) - Stake credential hash
   - `isArchived` (required) - Whether wallet is archived
   - `network` (required) - Network ID (0=testnet, 1=mainnet)
-  - `paymentAddress` (required) - Payment address
-  - `stakeableAddress` (required) - Stakeable address
 - **Response**: 
   ```json
   {

src/pages/api/v1/aggregatedBalances/balance.ts

@@ -53,10 +53,10 @@ export default async function handler(
     return res.status(401).json({ error: "Unauthorized" });
   }
 
-  const { walletId, walletName, signersAddresses, numRequiredSigners, type, stakeCredentialHash, isArchived, network, paymentAddress, stakeableAddress } = req.query;
+  const { walletId, walletName, signersAddresses, numRequiredSigners, type, stakeCredentialHash, isArchived, network } = req.query;
 
   // Validate required parameters
-  if (!walletId || !walletName || !signersAddresses || !numRequiredSigners || !type || !network || !paymentAddress || !stakeableAddress) {
+  if (!walletId || !walletName || !signersAddresses || !numRequiredSigners || !type || !network) {
     return res.status(400).json({ error: "Missing required parameters" });
   }
 
@@ -69,8 +69,6 @@ export default async function handler(
     const stakeCredentialHashStr = stakeCredentialHash as string;
     const isArchivedBool = isArchived === 'true';
     const networkNum = parseInt(network as string);
-    const paymentAddressStr = paymentAddress as string;
-    const stakeableAddressStr = stakeableAddress as string;
 
     // Build multisig wallet for address determination
     const walletData = {
@@ -97,29 +95,50 @@ export default async function handler(
       return res.status(400).json({ error: "Failed to build multisig wallet" });
     }
 
+    // Generate addresses from the built wallet
+    const nativeScript = {
+      type: typeStr || "atLeast",
+      scripts: signersAddressesArray.map((addr: string) => ({
+        type: "sig",
+        keyHash: resolvePaymentKeyHash(addr),
+      })),
+    };
+    if (nativeScript.type == "atLeast") {
+      //@ts-ignore
+      nativeScript.required = numRequiredSignersNum;
+    }
+
+    const paymentAddress = serializeNativeScript(
+      nativeScript as NativeScript,
+      stakeCredentialHashStr as undefined | string,
+      networkNum,
+    ).address;
+
+    const stakeableAddress = mWallet.getScript().address;
+
     // Determine which address to use
     const blockchainProvider = getProvider(networkNum);
 
     let paymentUtxos: UTxO[] = [];
     let stakeableUtxos: UTxO[] = [];
 
     try {
-      paymentUtxos = await blockchainProvider.fetchAddressUTxOs(paymentAddressStr);
-      stakeableUtxos = await blockchainProvider.fetchAddressUTxOs(stakeableAddressStr);
+      paymentUtxos = await blockchainProvider.fetchAddressUTxOs(paymentAddress);
+      stakeableUtxos = await blockchainProvider.fetchAddressUTxOs(stakeableAddress);
     } catch (utxoError) {
       console.error(`Failed to fetch UTxOs for wallet ${walletIdStr}:`, utxoError);
       // Continue with empty UTxOs
     }
 
     const paymentAddrEmpty = paymentUtxos.length === 0;
-    let walletAddress = paymentAddressStr;
+    let walletAddress = paymentAddress;
 
     if (paymentAddrEmpty && mWallet.stakingEnabled()) {
-      walletAddress = stakeableAddressStr;
+      walletAddress = stakeableAddress;
     }
 
     // Use the UTxOs from the selected address
-    let utxos: UTxO[] = walletAddress === stakeableAddressStr ? stakeableUtxos : paymentUtxos;
+    let utxos: UTxO[] = walletAddress === stakeableAddress ? stakeableUtxos : paymentUtxos;
 
     // If we still have no UTxOs, try the other network as fallback
     if (utxos.length === 0) {

src/pages/api/v1/aggregatedBalances/test.ts

@@ -151,8 +151,6 @@ export default async function handler(
             stakeCredentialHash: wallet.stakeCredentialHash || '',
             isArchived: wallet.isArchived.toString(),
             network: wallet.network.toString(),
-            paymentAddress: wallet.paymentAddress,
-            stakeableAddress: wallet.stakeableAddress,
           })}`;
 
           const balanceResponse = await fetch(balanceUrl, { headers });

src/pages/api/v1/aggregatedBalances/wallets.ts

@@ -1,23 +1,25 @@
 import { cors, addCorsCacheBustingHeaders } from "@/lib/cors";
 import type { Wallet as DbWallet } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
-import { buildMultisigWallet } from "@/utils/common";
 import { addressToNetwork } from "@/utils/multisigSDK";
-import { resolvePaymentKeyHash, serializeNativeScript } from "@meshsdk/core";
 import { db } from "@/server/db";
-import type { NativeScript } from "@meshsdk/core";
 
 interface WalletInfo {
   walletId: string;
   walletName: string;
+  description: string | null;
   signersAddresses: string[];
+  signersStakeKeys: string[];
+  signersDRepKeys: string[];
+  signersDescriptions: string[];
   numRequiredSigners: number;
-  type: string;
+  verified: string[];
+  scriptCbor: string;
   stakeCredentialHash: string | null;
+  type: string;
   isArchived: boolean;
+  clarityApiKey: string | null;
   network: number;
-  paymentAddress: string;
-  stakeableAddress: string;
 }
 
 interface WalletsResponse {
@@ -78,7 +80,7 @@ export default async function handler(
     let activeWalletCount = 0;
     let archivedWalletCount = 0;
 
-    // Process each wallet to extract wallet information
+    // Process each wallet to extract basic wallet information
     for (const wallet of allWallets) {
       try {
         // Determine network from signer addresses
@@ -87,33 +89,6 @@ export default async function handler(
           const signerAddr = wallet.signersAddresses[0]!;
           network = addressToNetwork(signerAddr);
         }
-        
-        const mWallet = buildMultisigWallet(wallet, network);
-        if (!mWallet) {
-          console.warn(`Failed to build multisig wallet for wallet ${wallet.id}`);
-          continue;
-        }
-
-        // Use the same address logic as the frontend buildWallet function
-        const nativeScript = {
-          type: wallet.type ? wallet.type : "atLeast",
-          scripts: wallet.signersAddresses.map((addr) => ({
-            type: "sig",
-            keyHash: resolvePaymentKeyHash(addr),
-          })),
-        };
-        if (nativeScript.type == "atLeast") {
-          //@ts-ignore
-          nativeScript.required = wallet.numRequiredSigners!;
-        }
-
-        const paymentAddress = serializeNativeScript(
-          nativeScript as NativeScript,
-          wallet.stakeCredentialHash as undefined | string,
-          network,
-        ).address;
-
-        const stakeableAddress = mWallet.getScript().address;
 
         // Count wallet types
         if (wallet.isArchived) {
@@ -125,14 +100,19 @@ export default async function handler(
         wallets.push({
           walletId: wallet.id,
           walletName: wallet.name,
+          description: wallet.description,
           signersAddresses: wallet.signersAddresses,
+          signersStakeKeys: wallet.signersStakeKeys,
+          signersDRepKeys: wallet.signersDRepKeys,
+          signersDescriptions: wallet.signersDescriptions,
           numRequiredSigners: wallet.numRequiredSigners!,
-          type: wallet.type || "atLeast",
+          verified: wallet.verified,
+          scriptCbor: wallet.scriptCbor,
           stakeCredentialHash: wallet.stakeCredentialHash,
+          type: wallet.type || "atLeast",
           isArchived: wallet.isArchived,
+          clarityApiKey: wallet.clarityApiKey,
           network,
-          paymentAddress,
-          stakeableAddress,
         });
 
       } catch (error) {