@haven-fi/solauto-sdk 1.0.572 → 1.0.573

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

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoClient.js

@@ -86,7 +86,6 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form contextUpdates
             }
         }
-        console.log("Resetting context updates...");
         this.contextUpdates.reset();
     }
     defaultLookupTables() {

package/dist/clients/solautoMarginfiClient.d.ts

@@ -43,7 +43,6 @@ 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":"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"}
+{"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"}

package/dist/clients/solautoMarginfiClient.js

@@ -443,12 +443,6 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 },
             ]);
         }
-        const banksRequiringBalanceClose = Array.from(new Set([
-            accounts.data.bank,
-            ...(this.intermediaryMarginfiAccount?.lendingAccount.balances ?? [])
-                .filter((x) => x.active && (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0)
-                .map((x) => x.bankPk.toString()),
-        ]));
         return (0, umi_1.transactionBuilder)()
             .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
             amount: flashLoanDetails.baseUnitAmount,
@@ -460,25 +454,11 @@ 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(banksRequiringBalanceClose.map((x) => this.closeBalance(this.intermediaryMarginfiAccountPk, new web3_js_1.PublicKey(x)))
-        // this.closeBalance(
-        //   this.intermediaryMarginfiAccountPk,
-        //   new PublicKey(accounts.data.bank)
-        // )
-        )
             .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;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"}
+{"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"}

package/dist/utils/marginfiUtils.js

@@ -322,6 +322,6 @@ function getUpToDateShareValues(bank) {
 }
 function marginfiAccountEmpty(marginfiAccount) {
     return (marginfiAccount.lendingAccount.balances.find((x) => x.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
-        ((0, numberUtils_1.bytesToI80F48)(x.assetShares.value) > 0 ||
-            (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0)) === undefined);
+        (Math.round((0, numberUtils_1.bytesToI80F48)(x.assetShares.value)) != 0 ||
+            Math.round((0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value)) != 0)) === undefined);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAerE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAoDnB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO,qBAqB/B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,GAClD,MAAM,GAAG,SAAS,CAKpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAcrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAsDnB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO,qBAgB/B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,GAClD,MAAM,GAAG,SAAS,CAKpB"}

package/dist/utils/priceUtils.js

@@ -28,6 +28,7 @@ exports.getPythPrices = getPythPrices;
 exports.getSwitchboardPrices = getSwitchboardPrices;
 exports.getJupTokenPrices = getJupTokenPrices;
 exports.safeGetPrice = safeGetPrice;
+const web3_js_1 = require("@solana/web3.js");
 const pythConstants_1 = require("../constants/pythConstants");
 const numberUtils_1 = require("./numberUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
@@ -89,47 +90,58 @@ async function getPythPrices(mints) {
     }, 5, 200);
     return prices;
 }
+function getSortedPriceData(prices, mints) {
+    const sortedPrices = {};
+    for (const mint of mints) {
+        const key = mint.toString();
+        if (prices.hasOwnProperty(key)) {
+            sortedPrices[key] = prices[key];
+        }
+    }
+    return sortedPrices;
+}
 async function getSwitchboardPrices(mints) {
     if (mints.length === 0) {
         return [];
     }
     const { CrossbarClient } = OnDemand;
     const crossbar = CrossbarClient.default();
-    let prices = [];
+    let prices = {};
     try {
         prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-            const res = await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()]));
-            const p = res.flatMap((x) => x.results[0]);
-            if (p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0) {
+            const resp = await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()]));
+            const prices = resp.flatMap((x) => x.results[0]);
+            if (prices.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0)
+                .length > 0) {
                 throw new Error("Unable to fetch Switchboard prices");
             }
-            return p.map((x) => typeof x === "string" ? parseFloat(x) : Number(x));
+            const finalMap = {};
+            for (const item of resp) {
+                for (const [k, v] of Object.entries(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS)) {
+                    if (item.feed === v) {
+                        finalMap[k] = Number(item.results[0]);
+                    }
+                }
+            }
+            return finalMap;
         }, 2, 350);
     }
     catch {
         (0, generalUtils_1.consoleLog)("Failed to fetch Switchboard prices after multiple retries");
     }
-    if (prices.length === 0) {
-        prices = Array(mints.length).fill(0);
-    }
-    const missingPrices = (0, generalUtils_1.zip)(mints, prices).filter((x) => !x[1] || isNaN(Number(x[1])));
-    const jupPrices = (0, generalUtils_1.zip)(missingPrices.map((x) => x[0]), await getJupTokenPrices(missingPrices.map((x) => x[0])));
-    prices = prices.map((x, i) => x ? x : jupPrices.find((y) => y[0].toString() === mints[i].toString())[1]);
-    return prices;
+    const missingMints = mints.filter((x) => !prices[x.toString()]);
+    const jupPrices = (0, generalUtils_1.zip)(missingMints, await getJupTokenPrices(missingMints.map((x) => new web3_js_1.PublicKey(x)))).reduce((acc, [key, value]) => {
+        acc[key.toString()] = value;
+        return acc;
+    }, {});
+    return Object.values(getSortedPriceData({ ...prices, ...jupPrices }, mints));
 }
 async function getJupTokenPrices(mints, mayIncludeSpamTokens) {
     if (mints.length == 0) {
         return [];
     }
-    const data = await (0, jupiterUtils_1.getJupPriceData)(mints, mayIncludeSpamTokens);
-    const sortedData = {};
-    for (const mint of mints) {
-        const key = mint.toString();
-        if (data.hasOwnProperty(key)) {
-            sortedData[key] = data[key];
-        }
-    }
-    return Object.values(sortedData).map((x) => x !== null && typeof x === "object" && "price" in x
+    const data = getSortedPriceData(await (0, jupiterUtils_1.getJupPriceData)(mints, mayIncludeSpamTokens), mints);
+    return Object.values(data).map((x) => x !== null && typeof x === "object" && "price" in x
         ? parseFloat(x.price)
         : 0);
 }

package/package.json

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

package/src/clients/solautoClient.ts

@@ -204,7 +204,6 @@ export abstract class SolautoClient extends ReferralStateManager {
         // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form contextUpdates
       }
     }
-    console.log("Resetting context updates...");
     this.contextUpdates.reset();
   }
 

package/src/clients/solautoMarginfiClient.ts

@@ -40,7 +40,6 @@ import {
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
-  lendingAccountCloseBalance,
   lendingAccountDeposit,
   lendingAccountEndFlashloan,
   lendingAccountRepay,
@@ -62,7 +61,7 @@ import {
   getMarginfiMaxLtvAndLiqThreshold,
   marginfiAccountEmpty,
 } from "../utils/marginfiUtils";
-import { bytesToI80F48, fromBaseUnit, toBps } from "../utils/numberUtils";
+import { fromBaseUnit, toBps } from "../utils/numberUtils";
 import { QuoteResponse } from "@jup-ag/api";
 import { consoleLog, safeGetPrice, splTokenTransferUmiIx } from "../utils";
 
@@ -585,10 +584,7 @@ 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
@@ -687,15 +683,6 @@ export class SolautoMarginfiClient extends SolautoClient {
       );
     }
 
-    const banksRequiringBalanceClose = Array.from(
-      new Set([
-        accounts.data.bank,
-        ...(this.intermediaryMarginfiAccount?.lendingAccount.balances ?? [])
-          .filter((x) => x.active && bytesToI80F48(x.liabilityShares.value) > 0)
-          .map((x) => x.bankPk.toString()),
-      ])
-    );
-
     return transactionBuilder()
       .add(
         lendingAccountRepay(this.umi, {
@@ -714,18 +701,6 @@ export class SolautoMarginfiClient extends SolautoClient {
           ),
         })
       )
-      .add(
-        banksRequiringBalanceClose.map((x) =>
-          this.closeBalance(
-            this.intermediaryMarginfiAccountPk,
-            new PublicKey(x)
-          )
-        )
-        // this.closeBalance(
-        //   this.intermediaryMarginfiAccountPk,
-        //   new PublicKey(accounts.data.bank)
-        // )
-      )
       .add(
         lendingAccountEndFlashloan(this.umi, {
           marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
@@ -734,17 +709,6 @@ 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,6 +15,7 @@ import { getTokenAccount } from "./accountUtils";
 import {
   consoleLog,
   retryWithExponentialBackoff,
+  tokenInfo,
 } from "./generalUtils";
 
 const jupApi = createJupiterApiClient();

package/src/utils/marginfiUtils.ts

@@ -591,8 +591,8 @@ export function marginfiAccountEmpty(marginfiAccount: MarginfiAccount) {
     marginfiAccount.lendingAccount.balances.find(
       (x) =>
         x.bankPk.toString() !== PublicKey.default.toString() &&
-        (bytesToI80F48(x.assetShares.value) > 0 ||
-          bytesToI80F48(x.liabilityShares.value) > 0)
+        (Math.round(bytesToI80F48(x.assetShares.value)) != 0 ||
+          Math.round(bytesToI80F48(x.liabilityShares.value)) != 0)
     ) === undefined
   );
 }

package/src/utils/priceUtils.ts

@@ -11,8 +11,7 @@ import {
   zip,
 } from "./generalUtils";
 import * as OnDemand from "@switchboard-xyz/on-demand";
-import { getJupPriceData, getJupQuote } from "./jupiterUtils";
-import { QuoteGetSwapModeEnum } from "@jup-ag/api";
+import { getJupPriceData } from "./jupiterUtils";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
@@ -99,35 +98,57 @@ export async function getPythPrices(mints: PublicKey[]) {
   return prices;
 }
 
+function getSortedPriceData(
+  prices: Record<string, number>,
+  mints: PublicKey[]
+) {
+  const sortedPrices: { [key: string]: any } = {};
+
+  for (const mint of mints) {
+    const key = mint.toString();
+    if (prices.hasOwnProperty(key)) {
+      sortedPrices[key] = prices[key];
+    }
+  }
+
+  return sortedPrices;
+}
+
 export async function getSwitchboardPrices(
   mints: PublicKey[]
 ): Promise<number[]> {
   if (mints.length === 0) {
     return [];
   }
-
   const { CrossbarClient } = OnDemand;
   const crossbar = CrossbarClient.default();
 
-  let prices: number[] = [];
+  let prices: Record<string, number> = {};
   try {
     prices = await retryWithExponentialBackoff(
       async () => {
-        const res = await crossbar.simulateSolanaFeeds(
+        const resp = await crossbar.simulateSolanaFeeds(
           "mainnet",
           mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
         );
 
-        const p = res.flatMap((x) => x.results[0]);
+        const prices = resp.flatMap((x) => x.results[0]);
         if (
-          p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0
+          prices.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0)
+            .length > 0
         ) {
           throw new Error("Unable to fetch Switchboard prices");
         }
 
-        return p.map((x) =>
-          typeof x === "string" ? parseFloat(x) : Number(x)
-        );
+        const finalMap: Record<string, number> = {};
+        for (const item of resp) {
+          for (const [k, v] of Object.entries(SWITCHBOARD_PRICE_FEED_IDS)) {
+            if (item.feed === v) {
+              finalMap[k] = Number(item.results[0]);
+            }
+          }
+        }
+        return finalMap;
       },
       2,
       350
@@ -136,23 +157,19 @@ export async function getSwitchboardPrices(
     consoleLog("Failed to fetch Switchboard prices after multiple retries");
   }
 
-  if (prices.length === 0) {
-    prices = Array(mints.length).fill(0);
-  }
-
-  const missingPrices = zip(mints, prices).filter(
-    (x) => !x[1] || isNaN(Number(x[1]))
-  );
+  const missingMints = mints.filter((x) => !prices[x.toString()]);
   const jupPrices = zip(
-    missingPrices.map((x) => x[0]),
-    await getJupTokenPrices(missingPrices.map((x) => x[0]))
-  );
-
-  prices = prices.map((x, i) =>
-    x ? x : jupPrices.find((y) => y[0].toString() === mints[i].toString())![1]
+    missingMints,
+    await getJupTokenPrices(missingMints.map((x) => new PublicKey(x)))
+  ).reduce(
+    (acc, [key, value]) => {
+      acc[key.toString()] = value;
+      return acc;
+    },
+    {} as Record<string, number>
   );
 
-  return prices;
+  return Object.values(getSortedPriceData({ ...prices, ...jupPrices }, mints));
 }
 
 export async function getJupTokenPrices(
@@ -163,17 +180,12 @@ export async function getJupTokenPrices(
     return [];
   }
 
-  const data = await getJupPriceData(mints, mayIncludeSpamTokens);
-
-  const sortedData: { [key: string]: any } = {};
-  for (const mint of mints) {
-    const key = mint.toString();
-    if (data.hasOwnProperty(key)) {
-      sortedData[key] = data[key];
-    }
-  }
+  const data = getSortedPriceData(
+    await getJupPriceData(mints, mayIncludeSpamTokens),
+    mints
+  );
 
-  return Object.values(sortedData).map((x) =>
+  return Object.values(data).map((x) =>
     x !== null && typeof x === "object" && "price" in x
       ? parseFloat(x.price as string)
       : 0
@@ -187,4 +199,4 @@ export function safeGetPrice(
     return PRICES[mint!.toString()].price;
   }
   return undefined;
-}
+}

package/tests/transactions/solautoMarginfi.ts

@@ -1,18 +1,9 @@
 import { describe, it } from "mocha";
-import {
-  none,
-  publicKey,
-  some,
-  transactionBuilder,
-  Umi,
-  UmiError,
-} from "@metaplex-foundation/umi";
+import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
-  fetchSolautoPosition,
   PositionType,
-  safeFetchAllSolautoPosition,
   safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
@@ -36,8 +27,6 @@ import { PublicKey } from "@solana/web3.js";
 import {
   DEFAULT_MARGINFI_GROUP,
   MARGINFI_ACCOUNTS,
-  POPCAT,
-  RETARDIO,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   USDC,
@@ -45,122 +34,22 @@ import {
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
-  fetchTokenPrices,
   getAllPositionsByAuthority,
-  getBankLiquidityAvailableBaseUnit,
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
   getSolautoPositionAccount,
-  marginfiAccountEmpty,
   retryWithExponentialBackoff,
-  safeGetPrice,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
-import {
-  buildIronforgeApiUrl,
-  fromBaseUnit,
-  tokenInfo,
-  USD_DECIMALS,
-} from "../../dist";
-import {
-  lendingPoolAccrueBankInterest,
-  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),
-    bytesToI80F48(imfiAccount.lendingAccount.balances[0].assetShares.value) *
-      bytesToI80F48(supplyBank.assetShareValue.value)
-  );
-  console.log(
-    bytesToI80F48(
-      imfiAccount.lendingAccount.balances[1].liabilityShares.value
-    ) * bytesToI80F48(debtBank.liabilityShareValue.value),
-    bytesToI80F48(imfiAccount.lendingAccount.balances[1].assetShares.value) *
-      bytesToI80F48(debtBank.assetShareValue.value)
-  );
-
-  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)
-  );
-}
+import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
 
 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 = true;
-  const positionId = 1;
+  const testProgram = false;
+  const positionId = 3;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -176,7 +65,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -186,42 +75,6 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
-    await test(
-      client.umi,
-      // new PublicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18"),
-      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(
@@ -289,68 +142,14 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async (attemptNum) =>
-    //       await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
-    //     "rebalance"
-    //   )
-    // );
-
-    const imfiAccount = await safeFetchMarginfiAccount(
-      client.umi,
-      // publicKey(client.intermediaryMarginfiAccountPk)
-      publicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18")
-    );
-
-    console.log(imfiAccount.lendingAccount.balances);
-    console.log(
-      imfiAccount.lendingAccount.balances.map((x) => [
-        x.bankPk.toString(),
-        x.liabilityShares.value,
-        bytesToI80F48(x.liabilityShares.value),
-      ])
+    transactionItems.push(
+      new TransactionItem(
+        async (attemptNum) =>
+          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+        "rebalance"
+      )
     );
 
-    console.log(marginfiAccountEmpty(imfiAccount));
-    return;
-
-    // transactionItems.push(
-    //   new TransactionItem(async () => ({
-    //     tx: transactionBuilder().add([
-    //       lendingPoolAccrueBankInterest(client.umi, {
-    //         bank: publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"),
-    //         marginfiGroup: publicKey(
-    //           "EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"
-    //         ),
-    //       }),
-    //       lendingPoolAccrueBankInterest(client.umi, {
-    //         bank: publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5"),
-    //         marginfiGroup: publicKey(
-    //           "EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"
-    //         ),
-    //       }),
-    //     ]),
-    //   }))
-    // );
-
-    // 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(
     //     async () => ({ tx: client.refresh() }),