chore: merge main branch into stable

.github/workflows/create-release.yml

@@ -89,46 +89,51 @@ jobs:
           fi
 
           # Format PRs for release notes
-          echo "formatted_prs<<EOF" >> $GITHUB_OUTPUT
-          while IFS='|' read -r number title body labels; do
-            echo "### PR #$number: $title"
-            echo "Labels: $labels"
+          {
+            echo "formatted_prs<<EOF"
+            while IFS='|' read -r number title body labels; do
+              echo "### PR #$number: $title"
+              echo "Labels: $labels"
+              echo ""
+              echo "$body"
+              echo ""
+            done < prs.txt
+            echo "EOF"
+          } >> $GITHUB_OUTPUT
+
+          # Format commits by type - use %s (subject) where conventional types live
+          # Wrap in block to redirect all output to GITHUB_OUTPUT
+          {
+            echo "formatted_commits<<EOF"
+            echo "### Breaking Changes"
+            if [ "$latest_tag" = "0.0.0" ]; then
+              git log --pretty=format:"- %s" | grep -E "^- (feat!|BREAKING CHANGE)" || echo "None"
+            else
+              git log $latest_tag..HEAD --pretty=format:"- %s" | grep -E "^- (feat!|BREAKING CHANGE)" || echo "None"
+            fi
             echo ""
-            echo "$body"
+            echo "### Features"
+            if [ "$latest_tag" = "0.0.0" ]; then
+              git log --pretty=format:"- %s" | grep -E "^- feat[^!]" || echo "None"
+            else
+              git log $latest_tag..HEAD --pretty=format:"- %s" | grep -E "^- feat[^!]" || echo "None"
+            fi
             echo ""
-          done < prs.txt
-          echo "EOF" >> $GITHUB_OUTPUT
-
-          # Format commits by type - use full commit messages for display
-          echo "formatted_commits<<EOF" >> $GITHUB_OUTPUT
-          echo "### Breaking Changes"
-          if [ "$latest_tag" = "0.0.0" ]; then
-            git log --pretty=format:"%B" | grep -E "^(feat!|BREAKING CHANGE)" || echo "None"
-          else
-            git log $latest_tag..HEAD --pretty=format:"%B" | grep -E "^(feat!|BREAKING CHANGE)" || echo "None"
-          fi
-          echo ""
-          echo "### Features"
-          if [ "$latest_tag" = "0.0.0" ]; then
-            git log --pretty=format:"%B" | grep -E "^(feat|\[minor\])" || echo "None"
-          else
-            git log $latest_tag..HEAD --pretty=format:"%B" | grep -E "^(feat|\[minor\])" || echo "None"
-          fi
-          echo ""
-          echo "### Fixes"
-          if [ "$latest_tag" = "0.0.0" ]; then
-            git log --pretty=format:"%B" | grep -E "^(fix)" || echo "None"
-          else
-            git log $latest_tag..HEAD --pretty=format:"%B" | grep -E "^(fix)" || echo "None"
-          fi
-          echo ""
-          echo "### Other Changes"
-          if [ "$latest_tag" = "0.0.0" ]; then
-            git log --pretty=format:"%B" | grep -E "^(chore|docs|style|refactor|perf|test|ci|build|revert)" || echo "None"
-          else
-            git log $latest_tag..HEAD --pretty=format:"%B" | grep -E "^(chore|docs|style|refactor|perf|test|ci|build|revert)" || echo "None"
-          fi
-          echo "EOF" >> $GITHUB_OUTPUT
+            echo "### Fixes"
+            if [ "$latest_tag" = "0.0.0" ]; then
+              git log --pretty=format:"- %s" | grep -E "^- fix" || echo "None"
+            else
+              git log $latest_tag..HEAD --pretty=format:"- %s" | grep -E "^- fix" || echo "None"
+            fi
+            echo ""
+            echo "### Other Changes"
+            if [ "$latest_tag" = "0.0.0" ]; then
+              git log --pretty=format:"- %s" | grep -E "^- (chore|docs|style|refactor|perf|test|ci|build|revert)" || echo "None"
+            else
+              git log $latest_tag..HEAD --pretty=format:"- %s" | grep -E "^- (chore|docs|style|refactor|perf|test|ci|build|revert)" || echo "None"
+            fi
+            echo "EOF"
+          } >> $GITHUB_OUTPUT
 
       - name: Generate new version
         id: new_version

__tests__/calculateCorrectedTotalBalance.test.ts

@@ -0,0 +1,39 @@
+import { calculateCorrectedTotalBalance } from "../app/utils";
+
+describe("calculateCorrectedTotalBalance", () => {
+  it("excludes CNGN face value from total when rate is null", () => {
+    const rawBalance = {
+      total: 1600,
+      balances: {
+        USDC: 100,
+        cNGN: 1500,
+      },
+    };
+
+    expect(calculateCorrectedTotalBalance(rawBalance, null)).toBe(100);
+  });
+
+  it("excludes CNGN face value from total when rate is non-positive", () => {
+    const rawBalance = {
+      total: 1600,
+      balances: {
+        USDC: 100,
+        CNGN: 1500,
+      },
+    };
+
+    expect(calculateCorrectedTotalBalance(rawBalance, 0)).toBe(100);
+  });
+
+  it("converts CNGN into USD equivalent when rate is available", () => {
+    const rawBalance = {
+      total: 1600,
+      balances: {
+        USDC: 100,
+        cNGN: 1500,
+      },
+    };
+
+    expect(calculateCorrectedTotalBalance(rawBalance, 1500)).toBe(101);
+  });
+});

app/api/aggregator.ts

@@ -45,6 +45,7 @@ export const fetchRate = async ({
   currency,
   providerId,
   network,
+  signal,
 }: RatePayload): Promise<RateResponse> => {
   const startTime = Date.now();
 
@@ -71,7 +72,7 @@ export const fetchRate = async ({
       params.network = network;
     }
 
-    const response = await axios.get(endpoint, { params });
+    const response = await axios.get(endpoint, { params, signal });
     const { data } = response;
 
     // Track successful response

app/api/v1/wallets/deprecate/route.ts

@@ -0,0 +1,183 @@
+import { NextRequest, NextResponse } from "next/server";
+import { supabaseAdmin } from "@/app/lib/supabase";
+import { withRateLimit } from "@/app/lib/rate-limit";
+import { trackApiRequest, trackApiResponse, trackApiError } from "@/app/lib/server-analytics";
+import { verifyJWT } from "@/app/lib/jwt";
+import { DEFAULT_PRIVY_CONFIG } from "@/app/lib/config";
+
+export const POST = withRateLimit(async (request: NextRequest) => {
+  const startTime = Date.now();
+
+  try {
+    // Step 1: Verify authentication token
+    const authHeader = request.headers.get("Authorization");
+    const token = authHeader?.replace("Bearer ", "");
+
+    if (!token) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Unauthorized"), 401);
+      return NextResponse.json(
+        { success: false, error: "Unauthorized" },
+        { status: 401 }
+      );
+    }
+
+    let authenticatedUserId: string;
+    try {
+      const jwtResult = await verifyJWT(token, DEFAULT_PRIVY_CONFIG);
+      authenticatedUserId = jwtResult.payload.sub;
+
+      if (!authenticatedUserId) {
+        trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Invalid token"), 401);
+        return NextResponse.json(
+          { success: false, error: "Invalid token" },
+          { status: 401 }
+        );
+      }
+    } catch (jwtError) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", jwtError as Error, 401);
+      return NextResponse.json(
+        { success: false, error: "Invalid or expired token" },
+        { status: 401 }
+      );
+    }
+
+    const walletAddress = request.headers.get("x-wallet-address")?.toLowerCase();
+    const body = await request.json();
+    const { oldAddress, newAddress, txHash, userId } = body;
+
+    if (!walletAddress || !oldAddress || !newAddress || !userId) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Missing required fields"), 400);
+      return NextResponse.json(
+        { success: false, error: "Missing required fields" },
+        { status: 400 }
+      );
+    }
+
+    // Step 2: Verify userId matches authenticated user (CRITICAL SECURITY FIX)
+    if (userId !== authenticatedUserId) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Unauthorized: userId mismatch"), 403);
+      return NextResponse.json(
+        { success: false, error: "Unauthorized" },
+        { status: 403 }
+      );
+    }
+
+    // Step 3: Verify wallet addresses match
+    if (newAddress.toLowerCase() !== walletAddress) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Wallet address mismatch"), 403);
+      return NextResponse.json(
+        { success: false, error: "Wallet address mismatch" },
+        { status: 403 }
+      );
+    }
+
+    trackApiRequest(request, "/api/v1/wallets/deprecate", "POST", {
+      wallet_address: walletAddress,
+      old_address: oldAddress,
+      new_address: newAddress,
+    });
+
+    // Step 4: Atomic database operations with rollback on failure
+    // Ensure old (SCW) wallet exists and mark as deprecated (upsert so we insert if never saved to DB)
+    const now = new Date().toISOString();
+    const { error: deprecateError } = await supabaseAdmin
+      .from("wallets")
+      .upsert(
+        {
+          address: oldAddress.toLowerCase(),
+          user_id: userId,
+          wallet_type: "smart_contract",
+          status: "deprecated",
+          deprecated_at: now,
+          migration_completed: true,
+          migration_tx_hash: txHash,
+          updated_at: now,
+        },
+        { onConflict: "address,user_id" }
+      );
+
+    if (deprecateError) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", deprecateError, 500);
+      throw deprecateError;
+    }
+
+    // Create or update new EOA wallet record
+    const { error: upsertError } = await supabaseAdmin
+      .from("wallets")
+      .upsert({
+        address: newAddress.toLowerCase(),
+        user_id: userId,
+        wallet_type: "eoa",
+        status: "active",
+        created_at: new Date().toISOString(),
+        updated_at: now,
+      }, { onConflict: "address,user_id" });
+
+    if (upsertError) {
+      // Rollback: Restore old wallet status
+      const { error: rollbackError } = await supabaseAdmin
+        .from("wallets")
+        .update({
+          status: "active",
+          deprecated_at: null,
+          migration_completed: false,
+          migration_tx_hash: null,
+          updated_at: new Date().toISOString(),
+        })
+        .eq("address", oldAddress.toLowerCase())
+        .eq("user_id", userId);
+
+      if (rollbackError) {
+        console.error("Critical: Rollback failed after EOA upsert error:", rollbackError);
+        trackApiError(request, "/api/v1/wallets/deprecate", "POST", rollbackError, 500);
+      }
+
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", upsertError, 500);
+      throw upsertError;
+    }
+
+    // Migrate KYC data
+    const { error: kycError } = await supabaseAdmin
+      .from("kyc_data")
+      .update({ wallet_address: newAddress.toLowerCase() })
+      .eq("wallet_address", oldAddress.toLowerCase())
+      .eq("user_id", userId);
+
+    if (kycError) {
+      console.error("KYC migration error:", kycError);
+      // Return partial success - wallet migrated but KYC migration failed
+      // This is better than rolling back the entire migration
+      const responseTime = Date.now() - startTime;
+      trackApiResponse("/api/v1/wallets/deprecate", "POST", 200, responseTime, {
+        wallet_address: walletAddress,
+        migration_successful: true,
+        kyc_migration_failed: true,
+      });
+
+      return NextResponse.json({
+        success: true,
+        message: "Wallet migrated but KYC migration failed",
+        kycMigrationFailed: true,
+      });
+    }
+
+    const responseTime = Date.now() - startTime;
+    trackApiResponse("/api/v1/wallets/deprecate", "POST", 200, responseTime, {
+      wallet_address: walletAddress,
+      migration_successful: true,
+    });
+
+    return NextResponse.json({ success: true, message: "Wallet migrated successfully" });
+  } catch (error) {
+    console.error("Error deprecating wallet:", error);
+    const responseTime = Date.now() - startTime;
+    trackApiError(request, "/api/v1/wallets/deprecate", "POST", error as Error, 500, {
+      response_time_ms: responseTime,
+    });
+
+    return NextResponse.json(
+      { success: false, error: "Internal server error" },
+      { status: 500 }
+    );
+  }
+});