@haven-fi/solauto-sdk 1.0.566 → 1.0.568

package/dist/clients/solautoMarginfiClient.d.ts

@@ -43,6 +43,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     rebalance(rebalanceStep: "A" | "B", jupQuote: QuoteResponse, rebalanceType: SolautoRebalanceTypeArgs, rebalanceValues: RebalanceValues, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
     flashBorrow(rebalanceType: SolautoRebalanceType, flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
     flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
+    closeBalance(marginfiAccount: PublicKey, bank: PublicKey): TransactionBuilder;
     getFreshPositionState(): Promise<PositionState | undefined>;
     supplyLiquidityAvailable(): bigint;
     supplyLiquidityDepositable(): bigint;

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAGL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,cAAc,CAAC,CAAY;IAE5B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAErD,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAE/B,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAiG1C,8BAA8B;IAwCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA0B3D,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IA+ErB,WAAW,CACT,aAAa,EAAE,oBAAoB,EACnC,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2CrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAwF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAmDjE,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;CAGjC"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoMarginfiClient.js

@@ -454,11 +454,22 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             signer: this.signer,
             signerTokenAccount: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoanDetails.mint)),
         }))
+            .add((this.intermediaryMarginfiAccount?.lendingAccount.balances ?? [])
+            .filter((x) => x.active && (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0)
+            .map((x) => this.closeBalance(this.intermediaryMarginfiAccountPk, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.bankPk))))
             .add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
             marginfiAccount: (0, umi_1.publicKey)(this.intermediaryMarginfiAccountPk),
             signer: this.signer,
         }).addRemainingAccounts(remainingAccounts));
     }
+    closeBalance(marginfiAccount, bank) {
+        return (0, umi_1.transactionBuilder)().add((0, marginfi_sdk_1.lendingAccountCloseBalance)(this.umi, {
+            signer: this.signer,
+            marginfiAccount: (0, umi_1.publicKey)(marginfiAccount),
+            bank: (0, umi_1.publicKey)(bank),
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+        }));
+    }
     async getFreshPositionState() {
         const state = await super.getFreshPositionState();
         if (state) {

package/dist/utils/jupiterUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAkB1D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CA2F7B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO;;GAwC/B"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AASrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAkB1D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CA2F7B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO;;GAwC/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.566",
+  "version": "1.0.568",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/clients/solautoMarginfiClient.ts

@@ -40,6 +40,7 @@ import {
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
+  lendingAccountCloseBalance,
   lendingAccountDeposit,
   lendingAccountEndFlashloan,
   lendingAccountRepay,
@@ -61,7 +62,7 @@ import {
   getMarginfiMaxLtvAndLiqThreshold,
   marginfiAccountEmpty,
 } from "../utils/marginfiUtils";
-import { fromBaseUnit, toBps } from "../utils/numberUtils";
+import { bytesToI80F48, fromBaseUnit, toBps } from "../utils/numberUtils";
 import { QuoteResponse } from "@jup-ag/api";
 import { consoleLog, safeGetPrice, splTokenTransferUmiIx } from "../utils";
 
@@ -584,7 +585,10 @@ export class SolautoMarginfiClient extends SolautoClient {
         return transactionBuilder().add(
           splTokenTransferUmiIx(
             this.signer,
-            getTokenAccount(toWeb3JsPublicKey(this.signer.publicKey), this.debtMint),
+            getTokenAccount(
+              toWeb3JsPublicKey(this.signer.publicKey),
+              this.debtMint
+            ),
             destinationTokenAccount,
             toWeb3JsPublicKey(this.signer.publicKey),
             flashLoanDetails.baseUnitAmount
@@ -701,6 +705,16 @@ export class SolautoMarginfiClient extends SolautoClient {
           ),
         })
       )
+      .add(
+        (this.intermediaryMarginfiAccount?.lendingAccount.balances ?? [])
+          .filter((x) => x.active && bytesToI80F48(x.liabilityShares.value) > 0)
+          .map((x) =>
+            this.closeBalance(
+              this.intermediaryMarginfiAccountPk,
+              toWeb3JsPublicKey(x.bankPk)
+            )
+          )
+      )
       .add(
         lendingAccountEndFlashloan(this.umi, {
           marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
@@ -709,6 +723,17 @@ export class SolautoMarginfiClient extends SolautoClient {
       );
   }
 
+  closeBalance(marginfiAccount: PublicKey, bank: PublicKey) {
+    return transactionBuilder().add(
+      lendingAccountCloseBalance(this.umi, {
+        signer: this.signer,
+        marginfiAccount: publicKey(marginfiAccount),
+        bank: publicKey(bank),
+        marginfiGroup: publicKey(this.marginfiGroup),
+      })
+    );
+  }
+
   async getFreshPositionState(): Promise<PositionState | undefined> {
     const state = await super.getFreshPositionState();
     if (state) {

package/src/utils/jupiterUtils.ts

@@ -15,7 +15,6 @@ import { getTokenAccount } from "./accountUtils";
 import {
   consoleLog,
   retryWithExponentialBackoff,
-  tokenInfo,
 } from "./generalUtils";
 
 const jupApi = createJupiterApiClient();

package/tests/transactions/solautoMarginfi.ts

@@ -1,9 +1,17 @@
 import { describe, it } from "mocha";
-import { none, publicKey, some } from "@metaplex-foundation/umi";
+import {
+  none,
+  publicKey,
+  some,
+  transactionBuilder,
+  Umi,
+} from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
+  fetchSolautoPosition,
   PositionType,
+  safeFetchAllSolautoPosition,
   safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
@@ -27,6 +35,8 @@ import { PublicKey } from "@solana/web3.js";
 import {
   DEFAULT_MARGINFI_GROUP,
   MARGINFI_ACCOUNTS,
+  POPCAT,
+  RETARDIO,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   USDC,
@@ -34,22 +44,120 @@ import {
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
+  fetchTokenPrices,
   getAllPositionsByAuthority,
+  getBankLiquidityAvailableBaseUnit,
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
   getSolautoPositionAccount,
   retryWithExponentialBackoff,
+  safeGetPrice,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
-import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
+import {
+  buildIronforgeApiUrl,
+  fromBaseUnit,
+  tokenInfo,
+  USD_DECIMALS,
+} from "../../dist";
+import {
+  safeFetchBank,
+  safeFetchMarginfiAccount,
+} from "../../src/marginfi-sdk";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+
+async function test(
+  umi: Umi,
+  sp: PublicKey | undefined,
+  supplyMint: PublicKey,
+  sb: PublicKey,
+  supplyMintDecimals: number,
+  debtMint: PublicKey,
+  db: PublicKey,
+  debtMintDecimals: number
+) {
+  const solautoPosition = sp
+    ? await fetchSolautoPosition(umi, publicKey(sp))
+    : undefined;
+
+  const mfiAccount = solautoPosition
+    ? await safeFetchMarginfiAccount(
+        umi,
+        solautoPosition.position.protocolUserAccount
+      )
+    : undefined;
+
+  const supplyBank = await safeFetchBank(umi, publicKey(sb));
+  const debtBank = await safeFetchBank(umi, publicKey(db));
+
+  await fetchTokenPrices([supplyMint, debtMint]);
+
+  console.log(supplyBank);
+  console.log(debtBank);
+
+  if (mfiAccount) {
+    console.log(mfiAccount.lendingAccount.balances);
+    console.log(
+      fromBaseUnit(
+        BigInt(
+          bytesToI80F48(
+            mfiAccount.lendingAccount.balances[0].assetShares.value
+          ) * bytesToI80F48(supplyBank.assetShareValue.value)
+        ),
+        supplyMintDecimals
+      ) * safeGetPrice(supplyMint)
+    );
+  }
+
+  const imfiAccount = await safeFetchMarginfiAccount(
+    umi,
+    publicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18")
+  );
+
+  console.log(
+    bytesToI80F48(
+      imfiAccount.lendingAccount.balances[0].liabilityShares.value
+    ) *
+      bytesToI80F48(supplyBank.liabilityShareValue.value) *
+      safeGetPrice(supplyMint)
+  );
+  console.log(
+    bytesToI80F48(
+      imfiAccount.lendingAccount.balances[1].liabilityShares.value
+    ) *
+      bytesToI80F48(debtBank.liabilityShareValue.value) *
+      safeGetPrice(debtMint)
+  );
+
+  console.log(
+    bytesToI80F48(supplyBank.totalAssetShares.value),
+    bytesToI80F48(supplyBank.totalLiabilityShares.value),
+    bytesToI80F48(supplyBank.totalAssetShares.value) -
+      bytesToI80F48(supplyBank.totalLiabilityShares.value),
+    fromBaseUnit(
+      getBankLiquidityAvailableBaseUnit(supplyBank, false),
+      supplyMintDecimals
+    ) * safeGetPrice(supplyMint)
+  );
+  console.log(
+    bytesToI80F48(debtBank.totalAssetShares.value),
+    bytesToI80F48(debtBank.totalLiabilityShares.value),
+    bytesToI80F48(debtBank.totalAssetShares.value) -
+      bytesToI80F48(debtBank.totalLiabilityShares.value),
+    fromBaseUnit(
+      getBankLiquidityAvailableBaseUnit(debtBank, false),
+      debtMintDecimals
+    ) * safeGetPrice(debtMint)
+  );
+}
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
   const payForTransactions = true;
-  const testProgram = false;
-  const positionId = 3;
+  const testProgram = true;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -65,7 +173,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
+      // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -75,6 +183,41 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
+    // await test(
+    //   client.umi,
+    //   undefined,
+    //   new PublicKey(RETARDIO),
+    //   new PublicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"),
+    //   6,
+    //   new PublicKey(USDC),
+    //   new PublicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5"),
+    //   6
+    // );
+    // await test(
+    //   client.umi,
+    //   new PublicKey("EcdfYZCtaePaDWVy9Cz6eiS5QbLbhThau1fHLhQTEZqs"),
+    //   new PublicKey(USDC),
+    //   new PublicKey("EXrnNVfLagt3j4hCHSD9WqK75o6dkZBtjpnrSrSC78MA"),
+    //   6,
+    //   new PublicKey(POPCAT),
+    //   new PublicKey("845oEvt1oduoBj5zQxTr21cWWaUVnRjGerJuW3yMo2nn"),
+    //   9
+    // );
+
+    // const mfiAccount = await safeFetchMarginfiAccount(
+    //   client.umi,
+    //   publicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18")
+    // );
+    // console.log(mfiAccount.lendingAccount.balances);
+    // console.log(
+    //   mfiAccount.lendingAccount.balances.map((x) =>
+    //     bytesToI80F48(x.liabilityShares.value)
+    //   )
+    // );
+    // console.log(
+    //   mfiAccount.lendingAccount.balances.map((x) => x.bankPk.toString())
+    // );
+
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
     //   boostToBps: maxBoostToBps(
@@ -142,13 +285,41 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    transactionItems.push(
-      new TransactionItem(
-        async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
-        "rebalance"
-      )
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async (attemptNum) =>
+    //       await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+    //     "rebalance"
+    //   )
+    // );
+
+    const imfiAccount = await safeFetchMarginfiAccount(
+      client.umi,
+      publicKey(client.intermediaryMarginfiAccountPk)
+    );
+
+    console.log(imfiAccount.lendingAccount.balances);
+    console.log(
+      imfiAccount.lendingAccount.balances.map((x) => x.bankPk.toString())
     );
+    return;
+
+    // transactionItems.push(
+    //   new TransactionItem(async () => ({
+    //     tx: transactionBuilder().add(
+    //       imfiAccount.lendingAccount.balances
+    //         .filter(
+    //           (x) => x.active && bytesToI80F48(x.liabilityShares.value) > 0
+    //         )
+    //         .map((x) =>
+    //           client.closeBalance(
+    //             client.intermediaryMarginfiAccountPk,
+    //             toWeb3JsPublicKey(x.bankPk)
+    //           )
+    //         )
+    //     ),
+    //   }))
+    // );
 
     // transactionItems.push(
     //   new TransactionItem(