Enhance Moolah SDK with holdings functionality and improve API parameter handling. Added support for fetching user holdings by type (vault or market) and updated market and vault list methods to accept multi-chain parameters. Updated tests to cover new holdings functionality.

Author: tyler-tsai

packages/moolah-lending-sdk/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lista-dao/moolah-lending-sdk
 
+## 1.0.3
+
+### Patch Changes
+
+- Enhance Moolah SDK with holdings functionality and improve API parameter handling
+- Updated dependencies
+  - @lista-dao/moolah-sdk-core@1.0.4
+
 ## 1.0.2
 
 ### Patch Changes

packages/moolah-lending-sdk/README.md

@@ -123,7 +123,7 @@ const chain = sdk.getApiChain(chainId); // "bsc" or "ethereum"
 
 // Market list with filters
 const markets = await sdk.getMarketList({
-  chain,
+  chain: [chain, "ethereum"], // also supports single string
   page: 1,
   pageSize: 20,
   sort: "rate", // Sort field
@@ -133,11 +133,12 @@ const markets = await sdk.getMarketList({
   loans: ["USDT"], // Filter by loan tokens
   collaterals: ["ETH"], // Filter by collateral tokens
   termType: 0, // 0 = flexible, 1 = fixed
+  smartLendingChecked: true, // Optional smart lending filter
 });
 
 // Vault list with filters
 const vaults = await sdk.getVaultList({
-  chain,
+  chain: [chain, "ethereum"], // also supports single string
   page: 1,
   pageSize: 20,
   sort: "apy",
@@ -154,6 +155,12 @@ const marketInfo = await sdk.getMarketInfo(chainId, marketId);
 // Vault metadata
 const vaultMeta = await sdk.getVaultMetadata(vaultAddress);
 
+// User holdings by type ("vault" | "market")
+const vaultHoldings = await sdk.getHoldings({
+  userAddress: walletAddress,
+  type: "vault",
+});
+
 // Vaults for a market
 const marketVaults = await sdk.getMarketVaultDetails(marketId, {
   page: 1,

packages/moolah-lending-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lista-dao/moolah-lending-sdk",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

packages/moolah-lending-sdk/src/MoolahSDK.ts

@@ -23,7 +23,13 @@ import type {
   ApiVaultInfo,
   ApiMarketList,
   ApiMarketVaultList,
+  ApiHoldingsParams,
+  ApiHoldingsData,
+  ApiVaultHoldingsData,
+  ApiMarketHoldingsData,
   ApiTableParams,
+  ApiVaultListParams,
+  ApiMarketListParams,
   NetworkName,
   NetworkContracts,
   WriteMarketConfig,
@@ -312,31 +318,38 @@ export class MoolahSDK {
     return this.apiClient.getMarketInfo(marketId);
   }
 
-  async getVaultList(
-    params: ApiTableParams & {
-      assets?: string[];
-      curators?: string[];
-      chain: string;
-    },
-  ): Promise<ApiVaultList> {
+  async getVaultList(params: ApiVaultListParams): Promise<ApiVaultList> {
     return this.apiClient.getVaultList(params);
   }
 
   async getVaultMetadata(address: Address): Promise<ApiVaultInfo> {
     return this.apiClient.getVaultInfo(address);
   }
 
-  async getMarketList(
-    params: ApiTableParams & {
-      loans?: string[];
-      collaterals?: string[];
-      termType?: number;
-      chain: string;
-    },
-  ): Promise<ApiMarketList> {
+  async getMarketList(params: ApiMarketListParams): Promise<ApiMarketList> {
     return this.apiClient.getMarketList(params);
   }
 
+  async getHoldings(
+    params: Omit<ApiHoldingsParams, "type"> & { type: "vault" },
+  ): Promise<ApiVaultHoldingsData>;
+  async getHoldings(
+    params: Omit<ApiHoldingsParams, "type"> & { type: "market" },
+  ): Promise<ApiMarketHoldingsData>;
+  async getHoldings(params: ApiHoldingsParams): Promise<ApiHoldingsData>;
+  async getHoldings(params: ApiHoldingsParams): Promise<ApiHoldingsData> {
+    if (params.type === "vault") {
+      return this.apiClient.getHoldings({
+        userAddress: params.userAddress,
+        type: "vault",
+      });
+    }
+    return this.apiClient.getHoldings({
+      userAddress: params.userAddress,
+      type: "market",
+    });
+  }
+
   async getMarketVaultDetails(
     marketId: Address,
     params?: Omit<ApiTableParams, "zone">,

packages/moolah-lending-sdk/src/__tests__/MoolahSDK.test.ts

@@ -145,6 +145,12 @@ vi.mock("@lista-dao/moolah-sdk-core", async (importOriginal) => {
         address: "0x1111111111111111111111111111111111111111",
       }),
       getMarketList: vi.fn().mockResolvedValue({ list: [], total: 0 }),
+      getHoldings: vi.fn().mockImplementation((params: { type: string }) => {
+        if (params.type === "market") {
+          return Promise.resolve({ objs: [], cdps: [], type: "market" });
+        }
+        return Promise.resolve({ objs: [], cdps: [], type: "vault" });
+      }),
       getMarketVaultDetails: vi.fn().mockResolvedValue({ list: [], total: 0 }),
     })),
   };
@@ -283,6 +289,26 @@ describe("MoolahSDK", () => {
       expect(result.list).toBeDefined();
     });
 
+    it("should get holdings from API", async () => {
+      const result = await sdk.getHoldings({
+        userAddress: WALLET,
+        type: "vault",
+      });
+      expect(result).toBeDefined();
+      expect(Array.isArray(result.objs)).toBe(true);
+      expect(result.type).toBe("vault");
+    });
+
+    it("should get market holdings from API", async () => {
+      const result = await sdk.getHoldings({
+        userAddress: WALLET,
+        type: "market",
+      });
+      expect(result).toBeDefined();
+      expect(Array.isArray(result.objs)).toBe(true);
+      expect(result.type).toBe("market");
+    });
+
     it("should get market vault details from API", async () => {
       const result = await sdk.getMarketVaultDetails(MARKET_ID);
       expect(result).toBeDefined();

packages/moolah-sdk-core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lista-dao/moolah-sdk-core
 
+## 1.0.4
+
+### Patch Changes
+
+- Enhance Moolah SDK with holdings functionality and improve API parameter handling
+
 ## 1.0.3
 
 ### Patch Changes

packages/moolah-sdk-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lista-dao/moolah-sdk-core",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

packages/moolah-sdk-core/src/__tests__/apiClient.test.ts

@@ -0,0 +1,107 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { MoolahApiClient } from "../api/client";
+
+function makeSuccessResponse<T>(data: T): Response {
+  return {
+    ok: true,
+    status: 200,
+    statusText: "OK",
+    json: async () => ({ code: "000000000", msg: "ok", data }),
+  } as unknown as Response;
+}
+
+describe("MoolahApiClient list query serialization", () => {
+  let fetchMock: ReturnType<typeof vi.fn>;
+  let client: MoolahApiClient;
+
+  beforeEach(() => {
+    fetchMock = vi.fn().mockResolvedValue(makeSuccessResponse({ total: 0, list: [] }));
+    client = new MoolahApiClient({
+      baseUrl: "https://api.lista.org",
+      fetch: fetchMock as unknown as typeof fetch,
+    });
+  });
+
+  it("should serialize vault filters using bracket array params", async () => {
+    await client.getVaultList({
+      page: 1,
+      pageSize: 10,
+      sort: "depositsUsd",
+      order: "desc",
+      zone: 0,
+      keyword: "123",
+      chain: ["bsc", "ethereum"],
+      assets: ["USDT", "BTCB"],
+      curators: ["Pangolins", "MEV Capital"],
+    });
+
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    const url = new URL(String(fetchMock.mock.calls[0][0]));
+
+    expect(url.pathname).toBe("/api/moolah/vault/list");
+    expect(url.searchParams.get("chain")).toBe("bsc,ethereum");
+    expect(url.searchParams.getAll("assets[]")).toEqual(["USDT", "BTCB"]);
+    expect(url.searchParams.getAll("curators[]")).toEqual([
+      "Pangolins",
+      "MEV Capital",
+    ]);
+    expect(url.searchParams.get("assets")).toBeNull();
+    expect(url.searchParams.get("curators")).toBeNull();
+  });
+
+  it("should serialize market filters with smartLendingChecked", async () => {
+    await client.getMarketList({
+      page: 1,
+      pageSize: 10,
+      sort: "liquidity",
+      order: "desc",
+      zone: 3,
+      keyword: "",
+      chain: ["bsc", "ethereum"],
+      loans: ["BTCB", "USDT"],
+      collaterals: ["BTCB", "SolvBTC"],
+      smartLendingChecked: true,
+    });
+
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    const url = new URL(String(fetchMock.mock.calls[0][0]));
+
+    expect(url.pathname).toBe("/api/moolah/borrow/markets");
+    expect(url.searchParams.get("chain")).toBe("bsc,ethereum");
+    expect(url.searchParams.getAll("loans[]")).toEqual(["BTCB", "USDT"]);
+    expect(url.searchParams.getAll("collaterals[]")).toEqual([
+      "BTCB",
+      "SolvBTC",
+    ]);
+    expect(url.searchParams.get("smartLendingChecked")).toBe("true");
+    expect(url.searchParams.get("loans")).toBeNull();
+    expect(url.searchParams.get("collaterals")).toBeNull();
+  });
+
+  it("should serialize holdings params for vault and market types", async () => {
+    await client.getHoldings({
+      userAddress: "0x05e3a7a66945ca9af73f66660f22ffb36332fa54",
+      type: "vault",
+    });
+    await client.getHoldings({
+      userAddress: "0x05e3a7a66945ca9af73f66660f22ffb36332fa54",
+      type: "market",
+    });
+
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+
+    const vaultUrl = new URL(String(fetchMock.mock.calls[0][0]));
+    expect(vaultUrl.pathname).toBe("/api/moolah/one/holding");
+    expect(vaultUrl.searchParams.get("userAddress")).toBe(
+      "0x05e3a7a66945ca9af73f66660f22ffb36332fa54",
+    );
+    expect(vaultUrl.searchParams.get("type")).toBe("vault");
+
+    const marketUrl = new URL(String(fetchMock.mock.calls[1][0]));
+    expect(marketUrl.pathname).toBe("/api/moolah/one/holding");
+    expect(marketUrl.searchParams.get("userAddress")).toBe(
+      "0x05e3a7a66945ca9af73f66660f22ffb36332fa54",
+    );
+    expect(marketUrl.searchParams.get("type")).toBe("market");
+  });
+});