@carrot-protocol/boost-http-client 0.2.15-group-refactor1-dev-875d3f7 → 0.2.15-group-refactor1-dev-966c84f

package/dist/index.d.ts

@@ -45,7 +45,7 @@ export declare class Client {
      * @param request Deposit leverage request parameters
      * @returns Deposit leverage operation result
      */
-    depositLeverage(clendGroup: web3.PublicKey, inputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, leverage: number, slippageBps: number): Promise<string>;
+    depositLeverage(clendGroup: web3.PublicKey, inputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, leverage: number, slippageBps: number, clendAccount: web3.PublicKey | null): Promise<string>;
     /**
      * Adjust the leverage of an existing position
      * @param request Adjust leverage request parameters

package/dist/index.js

@@ -184,50 +184,51 @@ class Client {
         }
         // if no clend accounts, return empty array
         const clendAccounts = [];
-        if (jsonRawResponse.clendAccounts) {
-            for (const [address, ca] of Object.entries(jsonRawResponse.clendAccounts)) {
-                // parse lending account balances
-                const clendAccountBalances = [];
-                for (const b of ca.balances) {
-                    // parse liquidation data if exists
-                    const liquidation = b.liquidation
-                        ? {
-                            price: Number(b.liquidation.price),
-                            changePercentage: Number(b.liquidation.changePercentage),
-                        }
-                        : null;
-                    // create clend account balance
-                    clendAccountBalances.push({
-                        mint: new anchor_1.web3.PublicKey(b.mint),
-                        bank: new anchor_1.web3.PublicKey(b.bank),
-                        assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
-                        assetBalanceUi: Number(b.assetBalanceUi),
-                        assetValue: Number(b.assetValue),
-                        liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
-                        liabilityBalanceUi: Number(b.liabilityBalanceUi),
-                        liabilityValue: Number(b.liabilityValue),
-                        price: Number(b.price),
-                        liquidation,
-                    });
-                }
-                // create clend account
-                const clendAccount = {
-                    balances: clendAccountBalances,
-                    netValue: Number(ca.netValue),
-                    netApy: Number(ca.netApy),
-                    pnl: Number(ca.pnl),
-                    totalAssetValue: Number(ca.totalAssetValue),
-                    totalLiabilityValue: Number(ca.totalLiabilityValue),
-                    healthFactorNotional: Number(ca.healthFactorNotional),
-                    healthFactorRiskAdjusted: Number(ca.healthFactorRiskAdjusted),
-                    notionalLeverage: Number(ca.notionalLeverage),
-                    riskAdjustedLeverage: Number(ca.riskAdjustedLeverage),
-                    notionalLtv: Number(ca.notionalLtv),
-                    riskAdjustedLtv: Number(ca.riskAdjustedLtv),
-                };
-                const summary = summaryByAccount.get(address) || [];
-                clendAccounts.push({ clendAccount, summary });
+        for (const accountAndSumary of jsonRawResponse.clendAccounts) {
+            const clendAccountBalances = [];
+            const ca = accountAndSumary.clendAccount;
+            for (const b of ca.balances) {
+                // parse liquidation data if exists
+                const liquidation = b.liquidation
+                    ? {
+                        price: Number(b.liquidation.price),
+                        changePercentage: Number(b.liquidation.changePercentage),
+                    }
+                    : null;
+                // create clend account balance
+                clendAccountBalances.push({
+                    mint: new anchor_1.web3.PublicKey(b.mint),
+                    bank: new anchor_1.web3.PublicKey(b.bank),
+                    assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
+                    assetBalanceUi: Number(b.assetBalanceUi),
+                    assetValue: Number(b.assetValue),
+                    liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
+                    liabilityBalanceUi: Number(b.liabilityBalanceUi),
+                    liabilityValue: Number(b.liabilityValue),
+                    price: Number(b.price),
+                    liquidation,
+                });
             }
+            // create clend account
+            const clendAccountAddress = new anchor_1.web3.PublicKey(accountAndSumary.clendAccount.key);
+            const clendAccount = {
+                key: clendAccountAddress,
+                balances: clendAccountBalances,
+                netValue: Number(ca.netValue),
+                netApy: Number(ca.netApy),
+                pnl: Number(ca.pnl),
+                totalAssetValue: Number(ca.totalAssetValue),
+                totalLiabilityValue: Number(ca.totalLiabilityValue),
+                healthFactorNotional: Number(ca.healthFactorNotional),
+                healthFactorRiskAdjusted: Number(ca.healthFactorRiskAdjusted),
+                notionalLeverage: Number(ca.notionalLeverage),
+                riskAdjustedLeverage: Number(ca.riskAdjustedLeverage),
+                notionalLtv: Number(ca.notionalLtv),
+                riskAdjustedLtv: Number(ca.riskAdjustedLtv),
+            };
+            // find corresponding tx summary for account
+            const summary = summaryByAccount.get(clendAccountAddress.toString()) || [];
+            clendAccounts.push({ clendAccount, summary });
         }
         return {
             wallet,
@@ -271,14 +272,15 @@ class Client {
      * @param request Deposit leverage request parameters
      * @returns Deposit leverage operation result
      */
-    async depositLeverage(clendGroup, inputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, leverage, slippageBps) {
-        if (!inputTokenMint.equals(assetTokenMint) ||
+    async depositLeverage(clendGroup, inputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, leverage, slippageBps, clendAccount) {
+        if (!inputTokenMint.equals(assetTokenMint) &&
             !inputTokenMint.equals(liabilityTokenMint)) {
             throw new Error("Input mint must be the same as the asset or liability mint");
         }
         const req = {
             owner: this.address(),
             clendGroup,
+            clendAccount,
             inputTokenMint,
             assetTokenMint,
             liabilityTokenMint,

package/dist/types.d.ts

@@ -9,6 +9,7 @@ export interface SendRequest {
 export interface DepositLeverageRequest {
     owner: web3.PublicKey;
     clendGroup: web3.PublicKey;
+    clendAccount: web3.PublicKey | null;
     inputTokenMint: web3.PublicKey;
     assetTokenMint: web3.PublicKey;
     liabilityTokenMint: web3.PublicKey;
@@ -85,6 +86,7 @@ export interface UserBalance {
     balanceUi: number;
 }
 export interface ClendAccount {
+    key: web3.PublicKey;
     balances: ClendAccountBalance[];
     netValue: number;
     netApy: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.15-group-refactor1-dev-875d3f7",
+  "version": "0.2.15-group-refactor1-dev-966c84f",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -206,57 +206,57 @@ export class Client {
       clendAccount: ClendAccount;
       summary: ClendAccountTxSummary[];
     }[] = [];
-    if (jsonRawResponse.clendAccounts) {
-      for (const [address, ca] of Object.entries(
-        jsonRawResponse.clendAccounts,
-      )) {
-        // parse lending account balances
-        const clendAccountBalances: ClendAccountBalance[] = [];
-        for (const b of (ca as any).balances) {
-          // parse liquidation data if exists
-          const liquidation: ClendAccountAssetLiquidation | null = b.liquidation
-            ? {
-                price: Number(b.liquidation.price),
-                changePercentage: Number(b.liquidation.changePercentage),
-              }
-            : null;
-
-          // create clend account balance
-          clendAccountBalances.push({
-            mint: new web3.PublicKey(b.mint),
-            bank: new web3.PublicKey(b.bank),
-            assetBalance: new BN(b.assetBalance, "hex"),
-            assetBalanceUi: Number(b.assetBalanceUi),
-            assetValue: Number(b.assetValue),
-            liabilityBalance: new BN(b.liabilityBalance, "hex"),
-            liabilityBalanceUi: Number(b.liabilityBalanceUi),
-            liabilityValue: Number(b.liabilityValue),
-            price: Number(b.price),
-            liquidation,
-          });
-        }
-
-        // create clend account
-        const clendAccount: ClendAccount = {
-          balances: clendAccountBalances,
-          netValue: Number((ca as any).netValue),
-          netApy: Number((ca as any).netApy),
-          pnl: Number((ca as any).pnl),
-          totalAssetValue: Number((ca as any).totalAssetValue),
-          totalLiabilityValue: Number((ca as any).totalLiabilityValue),
-          healthFactorNotional: Number((ca as any).healthFactorNotional),
-          healthFactorRiskAdjusted: Number(
-            (ca as any).healthFactorRiskAdjusted,
-          ),
-          notionalLeverage: Number((ca as any).notionalLeverage),
-          riskAdjustedLeverage: Number((ca as any).riskAdjustedLeverage),
-          notionalLtv: Number((ca as any).notionalLtv),
-          riskAdjustedLtv: Number((ca as any).riskAdjustedLtv),
-        };
-
-        const summary = summaryByAccount.get(address) || [];
-        clendAccounts.push({ clendAccount, summary });
+    for (const accountAndSumary of jsonRawResponse.clendAccounts) {
+      const clendAccountBalances: ClendAccountBalance[] = [];
+      const ca = accountAndSumary.clendAccount;
+      for (const b of ca.balances) {
+        // parse liquidation data if exists
+        const liquidation: ClendAccountAssetLiquidation | null = b.liquidation
+          ? {
+              price: Number(b.liquidation.price),
+              changePercentage: Number(b.liquidation.changePercentage),
+            }
+          : null;
+
+        // create clend account balance
+        clendAccountBalances.push({
+          mint: new web3.PublicKey(b.mint),
+          bank: new web3.PublicKey(b.bank),
+          assetBalance: new BN(b.assetBalance, "hex"),
+          assetBalanceUi: Number(b.assetBalanceUi),
+          assetValue: Number(b.assetValue),
+          liabilityBalance: new BN(b.liabilityBalance, "hex"),
+          liabilityBalanceUi: Number(b.liabilityBalanceUi),
+          liabilityValue: Number(b.liabilityValue),
+          price: Number(b.price),
+          liquidation,
+        });
       }
+
+      // create clend account
+      const clendAccountAddress = new web3.PublicKey(
+        accountAndSumary.clendAccount.key,
+      );
+      const clendAccount: ClendAccount = {
+        key: clendAccountAddress,
+        balances: clendAccountBalances,
+        netValue: Number(ca.netValue),
+        netApy: Number(ca.netApy),
+        pnl: Number(ca.pnl),
+        totalAssetValue: Number(ca.totalAssetValue),
+        totalLiabilityValue: Number(ca.totalLiabilityValue),
+        healthFactorNotional: Number(ca.healthFactorNotional),
+        healthFactorRiskAdjusted: Number(ca.healthFactorRiskAdjusted),
+        notionalLeverage: Number(ca.notionalLeverage),
+        riskAdjustedLeverage: Number(ca.riskAdjustedLeverage),
+        notionalLtv: Number(ca.notionalLtv),
+        riskAdjustedLtv: Number(ca.riskAdjustedLtv),
+      };
+
+      // find corresponding tx summary for account
+      const summary =
+        summaryByAccount.get(clendAccountAddress.toString()) || [];
+      clendAccounts.push({ clendAccount, summary });
     }
 
     return {
@@ -322,9 +322,10 @@ export class Client {
     uiAmount: number,
     leverage: number,
     slippageBps: number,
+    clendAccount: web3.PublicKey | null,
   ): Promise<string> {
     if (
-      !inputTokenMint.equals(assetTokenMint) ||
+      !inputTokenMint.equals(assetTokenMint) &&
       !inputTokenMint.equals(liabilityTokenMint)
     ) {
       throw new Error(
@@ -335,6 +336,7 @@ export class Client {
     const req: DepositLeverageRequest = {
       owner: this.address(),
       clendGroup,
+      clendAccount,
       inputTokenMint,
       assetTokenMint,
       liabilityTokenMint,

package/src/types.ts

@@ -12,6 +12,7 @@ export interface SendRequest {
 export interface DepositLeverageRequest {
   owner: web3.PublicKey;
   clendGroup: web3.PublicKey;
+  clendAccount: web3.PublicKey | null;
   inputTokenMint: web3.PublicKey;
   assetTokenMint: web3.PublicKey;
   liabilityTokenMint: web3.PublicKey;
@@ -99,6 +100,7 @@ export interface UserBalance {
 }
 
 export interface ClendAccount {
+  key: web3.PublicKey;
   balances: ClendAccountBalance[];
   netValue: number;
   netApy: number;