@haven-fi/solauto-sdk 1.0.668 → 1.0.669

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -119,7 +119,7 @@ class RebalanceTxBuilder {
         if (!rebalanceValues) {
             return undefined;
         }
-        if (!this.client.pos.rebalanceHelper.validRealtimePricesBoost(rebalanceValues.debtAdjustmentUsd)) {
+        if (!this.client.pos.rebalance.validRealtimePricesBoost(rebalanceValues.debtAdjustmentUsd)) {
             this.priceType = generated_1.PriceType.Ema;
             rebalanceValues = this.getRebalanceValues();
             if (!rebalanceValues) {

package/dist/solautoPosition/positionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"positionUtils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/positionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,kBAAkB,EAElB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAoC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}
+{"version":3,"file":"positionUtils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/positionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,kBAAkB,EAElB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAG7B,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAoC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -41,7 +41,7 @@ export declare abstract class SolautoPositionEx {
     private readonly firstState;
     private _supplyPrice?;
     private _debtPrice?;
-    rebalanceHelper: PositionRebalanceHelper;
+    rebalance: PositionRebalanceHelper;
     constructor(args: PositionExArgs);
     abstract lendingPool(): Promise<PublicKey>;
     get exists(): boolean;
@@ -83,7 +83,7 @@ export declare abstract class SolautoPositionEx {
     abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
     abstract priceOracles(): Promise<PublicKey[]>;
     get memecoinPosition(): boolean | undefined;
-    eligibleForRebalance(bpsDistanceThreshold?: number): RebalanceAction | undefined;
+    eligibleForRebalance(bpsDistanceThreshold?: number, skipExtraChecks?: boolean): RebalanceAction | undefined;
     eligibleForRefresh(): boolean;
     abstract refreshPositionState(priceType?: PriceType): Promise<void>;
     utilizationRateBpsDrift(priceType?: PriceType): Promise<number>;
@@ -102,7 +102,7 @@ declare class PositionRebalanceHelper {
     private sufficientLiquidityToBoost;
     validRealtimePricesBoost(debtAdjustmentUsd: number): boolean;
     private validBoostFromHere;
-    eligibleForRebalance(bpsDistanceThreshold: number): RebalanceAction | undefined;
+    eligibleForRebalance(bpsDistanceThreshold: number, skipExtraChecks?: boolean): RebalanceAction | undefined;
 }
 export {};
 //# sourceMappingURL=solautoPositionEx.d.ts.map

package/dist/solautoPosition/solautoPositionEx.d.ts.map

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

package/dist/solautoPosition/solautoPositionEx.js

@@ -27,7 +27,7 @@ class SolautoPositionEx {
         this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
         this._data = args.data;
         this.firstState = { ...args.data.state };
-        this.rebalanceHelper = new PositionRebalanceHelper(this);
+        this.rebalance = new PositionRebalanceHelper(this);
     }
     get exists() {
         return this._data.position !== undefined;
@@ -143,8 +143,8 @@ class SolautoPositionEx {
     get memecoinPosition() {
         return (0, utils_1.tokenInfo)(this.supplyMint).isMeme || (0, utils_1.tokenInfo)(this.debtMint).isMeme;
     }
-    eligibleForRebalance(bpsDistanceThreshold = 0) {
-        return this.rebalanceHelper.eligibleForRebalance(bpsDistanceThreshold);
+    eligibleForRebalance(bpsDistanceThreshold = 0, skipExtraChecks) {
+        return this.rebalance.eligibleForRebalance(bpsDistanceThreshold, skipExtraChecks);
     }
     eligibleForRefresh() {
         if (this.selfManaged)
@@ -227,14 +227,20 @@ class PositionRebalanceHelper {
         return postRebalanceLiqUtilRate <= this.pos.maxBoostToBps;
     }
     validBoostFromHere() {
+        const realtimeSupplyUsd = this.pos.supplyUsd(generated_1.PriceType.Realtime);
+        const realtimeDebtUsd = this.pos.debtUsd(generated_1.PriceType.Realtime);
+        if (realtimeSupplyUsd === this.pos.supplyUsd(generated_1.PriceType.Ema) &&
+            realtimeDebtUsd === this.pos.debtUsd(generated_1.PriceType.Ema)) {
+            return true;
+        }
         const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.pos.state.liqThresholdBps, {
-            supplyUsd: this.pos.supplyUsd(generated_1.PriceType.Realtime),
-            debtUsd: this.pos.debtUsd(generated_1.PriceType.Realtime),
+            supplyUsd: realtimeSupplyUsd,
+            debtUsd: realtimeDebtUsd,
         }, this.pos.boostToBps, { solauto: 25, lpBorrow: 0, flashLoan: 0 } // Undershoot fees
         );
         return this.validRealtimePricesBoost(debtAdjustmentUsd);
     }
-    eligibleForRebalance(bpsDistanceThreshold) {
+    eligibleForRebalance(bpsDistanceThreshold, skipExtraChecks) {
         if (!this.pos.settings || !this.pos.supplyUsd()) {
             return undefined;
         }
@@ -244,8 +250,8 @@ class PositionRebalanceHelper {
             return "repay";
         }
         else if (realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold &&
-            this.validBoostFromHere() &&
-            this.sufficientLiquidityToBoost()) {
+            (!skipExtraChecks ||
+                (this.validBoostFromHere() && this.sufficientLiquidityToBoost()))) {
             return "boost";
         }
         return undefined;

package/dist/utils/index.d.ts

@@ -3,7 +3,7 @@ export * from "./generalUtils";
 export * from "./instructionUtils";
 export * from "./jitoUtils";
 export * from "./jupiterUtils";
-export * from "./marginfiUtils";
+export * from "./marginfi";
 export * from "./numberUtils";
 export * from "./solautoUtils";
 export * from "./solanaUtils";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC"}

package/dist/utils/index.js

@@ -19,7 +19,7 @@ __exportStar(require("./generalUtils"), exports);
 __exportStar(require("./instructionUtils"), exports);
 __exportStar(require("./jitoUtils"), exports);
 __exportStar(require("./jupiterUtils"), exports);
-__exportStar(require("./marginfiUtils"), exports);
+__exportStar(require("./marginfi"), exports);
 __exportStar(require("./numberUtils"), exports);
 __exportStar(require("./solautoUtils"), exports);
 __exportStar(require("./solanaUtils"), exports);

package/dist/utils/marginfi/data.d.ts

@@ -0,0 +1,41 @@
+import { PublicKey } from "@solana/web3.js";
+import { Umi } from "@metaplex-foundation/umi";
+import { ProgramEnv } from "../../types";
+import { PositionState, PriceType } from "../../generated";
+import { Bank, MarginfiAccount } from "../../marginfi-sdk";
+import { ContextUpdates } from "../solautoUtils";
+export declare function getMarginfiMaxLtvAndLiqThresholdBps(umi: Umi, marginfiGroup: PublicKey, supply: {
+    mint: PublicKey;
+    bank?: Bank | null;
+}, debt: {
+    mint: PublicKey;
+    bank?: Bank | null;
+}, supplyPrice?: number): Promise<[number, number]>;
+export declare function getEmptyMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey): Promise<MarginfiAccount[]>;
+export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, group?: PublicKey, compatibleWithSolauto?: boolean): Promise<{
+    marginfiAccount: PublicKey;
+    supplyMint?: PublicKey;
+    debtMint?: PublicKey;
+}[]>;
+export declare function getBankLiquidityAvailableBaseUnit(bank: Bank | null, availableToDeposit: boolean): bigint;
+interface BankSelection {
+    mint?: PublicKey;
+    banksCache?: BanksCache;
+}
+type BanksCache = {
+    [group: string]: {
+        [mint: string]: Bank;
+    };
+};
+export declare function getMarginfiAccountPositionState(umi: Umi, lpUserAccount: {
+    pk?: PublicKey;
+    data?: MarginfiAccount | null;
+}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, programEnv?: ProgramEnv, contextUpdates?: ContextUpdates, priceType?: PriceType): Promise<{
+    supplyBank: Bank | null;
+    debtBank: Bank | null;
+    state: PositionState;
+} | undefined>;
+export declare function calculateAnnualAPYs(bank: Bank): [number, number];
+export declare function getUpToDateShareValues(bank: Bank): [number, number];
+export {};
+//# sourceMappingURL=data.d.ts.map

package/dist/utils/marginfi/data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AA0DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,UAAU,EACvB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IAAE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACxE,SAAS,CACZ,CA2KA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}

package/dist/utils/{marginfiUtils.js → marginfi/data.js}

@@ -1,13 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDynamicMarginfiProgram = createDynamicMarginfiProgram;
-exports.umiWithMarginfiProgram = umiWithMarginfiProgram;
-exports.getAllBankRelatedAccounts = getAllBankRelatedAccounts;
-exports.fetchBankAddresses = fetchBankAddresses;
-exports.getMarginfiPriceOracle = getMarginfiPriceOracle;
-exports.findMarginfiAccounts = findMarginfiAccounts;
-exports.getRemainingAccountsForMarginfiHealthCheck = getRemainingAccountsForMarginfiHealthCheck;
-exports.calcMarginfiMaxLtvAndLiqThresholdBps = calcMarginfiMaxLtvAndLiqThresholdBps;
 exports.getMarginfiMaxLtvAndLiqThresholdBps = getMarginfiMaxLtvAndLiqThresholdBps;
 exports.getEmptyMarginfiAccountsByAuthority = getEmptyMarginfiAccountsByAuthority;
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
@@ -15,139 +7,15 @@ exports.getBankLiquidityAvailableBaseUnit = getBankLiquidityAvailableBaseUnit;
 exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
 exports.calculateAnnualAPYs = calculateAnnualAPYs;
 exports.getUpToDateShareValues = getUpToDateShareValues;
-exports.marginfiAccountEmpty = marginfiAccountEmpty;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
-const constants_1 = require("../constants");
-const marginfi_sdk_1 = require("../marginfi-sdk");
-const priceUtils_1 = require("./priceUtils");
-const generalUtils_1 = require("./generalUtils");
-const numberUtils_1 = require("./numberUtils");
-const accountUtils_1 = require("./accountUtils");
-const pythUtils_1 = require("./pythUtils");
-const solanaUtils_1 = require("./solanaUtils");
-function createDynamicMarginfiProgram(env) {
-    return {
-        name: "marginfi",
-        publicKey: (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(env ?? "Prod").program),
-        getErrorFromCode(code, cause) {
-            return (0, marginfi_sdk_1.getMarginfiErrorFromCode)(code, this, cause);
-        },
-        getErrorFromName(name, cause) {
-            return (0, marginfi_sdk_1.getMarginfiErrorFromName)(name, this, cause);
-        },
-        isOnCluster() {
-            return true;
-        },
-    };
-}
-function umiWithMarginfiProgram(umi, marginfiEnv) {
-    return umi.use({
-        install(umi) {
-            umi.programs.add(createDynamicMarginfiProgram(marginfiEnv ?? "Prod"), false);
-        },
-    });
-}
-async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
-    const banks = Object.values(bankAccountsMap).flatMap((group) => Object.values(group).map((accounts) => accounts.bank));
-    const banksData = await (0, marginfi_sdk_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
-    const oracles = banksData
-        .map((bank) => {
-        const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.config.oracleKeys[0]);
-        return bank.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
-            ? [
-                (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
-                (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
-            ]
-            : [oracleKey];
-    })
-        .flat()
-        .map((x) => x.toString());
-    const otherAccounts = Object.entries(bankAccountsMap).flatMap(([groupName, tokenMap]) => Object.values(tokenMap).flatMap((accounts) => [
-        groupName,
-        accounts.liquidityVault,
-        accounts.vaultAuthority,
-    ]));
-    return Array.from(new Set([...banks, ...oracles, ...otherAccounts]))
-        .filter((x) => x !== web3_js_1.PublicKey.default.toString())
-        .map((x) => new web3_js_1.PublicKey(x));
-}
-async function fetchBankAddresses(umi, bankPk) {
-    const bank = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bankPk));
-    const liquidityVault = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.liquidityVault);
-    const vaultAuthority = (await (0, accountUtils_1.getTokenAccountData)(umi, liquidityVault))
-        ?.owner;
-    const priceOracle = await getMarginfiPriceOracle(umi, { data: bank });
-    return {
-        bank: bankPk,
-        liquidityVault,
-        vaultAuthority,
-        priceOracle,
-    };
-}
-async function getMarginfiPriceOracle(umi, bank) {
-    if (!bank.data) {
-        bank.data = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
-    }
-    const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
-    const priceOracle = bank.data.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
-        ? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, [
-            (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
-            (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
-        ])
-        : oracleKey;
-    return priceOracle;
-}
-function findMarginfiAccounts(bank) {
-    const search = (bankAccounts) => {
-        for (const group in bankAccounts) {
-            for (const key in bankAccounts[group]) {
-                const account = bankAccounts[group][key];
-                if (account.bank.toString().toLowerCase() ===
-                    bank.toString().toLowerCase()) {
-                    return { ...account, mint: new web3_js_1.PublicKey(key) };
-                }
-            }
-        }
-    };
-    let res = search((0, constants_1.getMarginfiAccounts)("Prod").bankAccounts);
-    if (res) {
-        return res;
-    }
-    res = search((0, constants_1.getMarginfiAccounts)("Staging").bankAccounts);
-    if (res) {
-        return res;
-    }
-    throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
-}
-async function getRemainingAccountsForMarginfiHealthCheck(umi, balance) {
-    if (!balance.active) {
-        return [];
-    }
-    const priceOracle = await getMarginfiPriceOracle(umi, {
-        pk: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(balance.bankPk),
-    });
-    return [
-        (0, solanaUtils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(balance.bankPk)),
-        (0, solanaUtils_1.getAccountMeta)(priceOracle),
-    ];
-}
-function calcMarginfiMaxLtvAndLiqThresholdBps(supplyBank, debtBank, supplyPrice) {
-    let maxLtv = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightInit.value) /
-        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightInit.value);
-    const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightMaint.value) /
-        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightMaint.value);
-    const totalDepositedUsdValue = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round((0, numberUtils_1.bytesToI80F48)(supplyBank.totalAssetShares.value) *
-        (0, numberUtils_1.bytesToI80F48)(supplyBank.assetShareValue.value))), supplyBank.mintDecimals) * supplyPrice;
-    if (supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
-        totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit) {
-        const discount = Number(supplyBank.config.totalAssetValueInitLimit) /
-            totalDepositedUsdValue;
-        maxLtv = maxLtv * Number(discount);
-    }
-    return [(0, numberUtils_1.toBps)(maxLtv, "Floor"), (0, numberUtils_1.toBps)(liqThreshold, "Floor")];
-}
+const constants_1 = require("../../constants");
+const marginfi_sdk_1 = require("../../marginfi-sdk");
+const priceUtils_1 = require("../priceUtils");
+const generalUtils_1 = require("../generalUtils");
+const numberUtils_1 = require("../numberUtils");
+const general_1 = require("./general");
 async function getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, supply, debt, supplyPrice) {
     if (!supply.bank && !(0, generalUtils_1.validPubkey)(supply.mint)) {
         return [0, 0];
@@ -168,7 +36,7 @@ async function getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, supply, d
     if (!debt.bank || debt.bank === null) {
         return [0, 0];
     }
-    return calcMarginfiMaxLtvAndLiqThresholdBps(supply.bank, debt.bank, supplyPrice);
+    return (0, general_1.calcMarginfiMaxLtvAndLiqThresholdBps)(supply.bank, debt.bank, supplyPrice);
 }
 async function getEmptyMarginfiAccountsByAuthority(umi, authority) {
     const marginfiAccounts = await umi.rpc.getProgramAccounts(umi.programs.get("marginfi").publicKey, {
@@ -194,7 +62,7 @@ async function getEmptyMarginfiAccountsByAuthority(umi, authority) {
     });
     return marginfiAccounts
         .map((x) => (0, marginfi_sdk_1.deserializeMarginfiAccount)(x))
-        .filter((x) => marginfiAccountEmpty(x));
+        .filter((x) => (0, general_1.marginfiAccountEmpty)(x));
 }
 async function getAllMarginfiAccountsByAuthority(umi, authority, group, compatibleWithSolauto) {
     const marginfiAccounts = await umi.rpc.getProgramAccounts(umi.programs.get("marginfi").publicKey, {
@@ -452,8 +320,3 @@ function getUpToDateShareValues(bank) {
         calcAccruedInterestPaymentPerPeriod(borrowingApr, timeDelta, (0, numberUtils_1.bytesToI80F48)(bank.liabilityShareValue.value)),
     ];
 }
-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.000001 ||
-            (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0.000001)) === undefined);
-}

package/dist/utils/marginfi/general.d.ts

@@ -0,0 +1,27 @@
+import { PublicKey } from "@solana/web3.js";
+import { AccountMeta, Program, Umi } from "@metaplex-foundation/umi";
+import { ProgramEnv, MarginfiAssetAccounts } from "../../types";
+import { MarginfiBankAccountsMap } from "../../constants";
+import { Balance, Bank, MarginfiAccount } from "../../marginfi-sdk";
+export declare function createDynamicMarginfiProgram(env?: ProgramEnv): Program;
+export declare function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv): Umi;
+export declare function getAllBankRelatedAccounts(umi: Umi, bankAccountsMap: MarginfiBankAccountsMap): Promise<PublicKey[]>;
+export declare function fetchBankAddresses(umi: Umi, bankPk: PublicKey): Promise<{
+    bank: PublicKey;
+    liquidityVault: PublicKey;
+    vaultAuthority: PublicKey | undefined;
+    priceOracle: PublicKey;
+}>;
+export declare function getMarginfiPriceOracle(umi: Umi, bank: {
+    pk?: PublicKey;
+    data?: Bank;
+}): Promise<PublicKey>;
+interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
+    mint: PublicKey;
+}
+export declare function findMarginfiAccounts(bank: PublicKey): AllMarginfiAssetAccounts;
+export declare function getRemainingAccountsForMarginfiHealthCheck(umi: Umi, balance: Balance): Promise<AccountMeta[]>;
+export declare function calcMarginfiMaxLtvAndLiqThresholdBps(supplyBank: Bank, debtBank: Bank, supplyPrice: number): [number, number];
+export declare function marginfiAccountEmpty(marginfiAccount: MarginfiAccount): boolean;
+export {};
+//# sourceMappingURL=general.d.ts.map

package/dist/utils/marginfi/general.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAS5B,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CAkCtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAgBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}

package/dist/utils/marginfi/general.js

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDynamicMarginfiProgram = createDynamicMarginfiProgram;
+exports.umiWithMarginfiProgram = umiWithMarginfiProgram;
+exports.getAllBankRelatedAccounts = getAllBankRelatedAccounts;
+exports.fetchBankAddresses = fetchBankAddresses;
+exports.getMarginfiPriceOracle = getMarginfiPriceOracle;
+exports.findMarginfiAccounts = findMarginfiAccounts;
+exports.getRemainingAccountsForMarginfiHealthCheck = getRemainingAccountsForMarginfiHealthCheck;
+exports.calcMarginfiMaxLtvAndLiqThresholdBps = calcMarginfiMaxLtvAndLiqThresholdBps;
+exports.marginfiAccountEmpty = marginfiAccountEmpty;
+const web3_js_1 = require("@solana/web3.js");
+const umi_1 = require("@metaplex-foundation/umi");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const constants_1 = require("../../constants");
+const marginfi_sdk_1 = require("../../marginfi-sdk");
+const numberUtils_1 = require("../numberUtils");
+const accountUtils_1 = require("../accountUtils");
+const pythUtils_1 = require("../pythUtils");
+const solanaUtils_1 = require("../solanaUtils");
+function createDynamicMarginfiProgram(env) {
+    return {
+        name: "marginfi",
+        publicKey: (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(env ?? "Prod").program),
+        getErrorFromCode(code, cause) {
+            return (0, marginfi_sdk_1.getMarginfiErrorFromCode)(code, this, cause);
+        },
+        getErrorFromName(name, cause) {
+            return (0, marginfi_sdk_1.getMarginfiErrorFromName)(name, this, cause);
+        },
+        isOnCluster() {
+            return true;
+        },
+    };
+}
+function umiWithMarginfiProgram(umi, marginfiEnv) {
+    return umi.use({
+        install(umi) {
+            umi.programs.add(createDynamicMarginfiProgram(marginfiEnv ?? "Prod"), false);
+        },
+    });
+}
+async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
+    const banks = Object.values(bankAccountsMap).flatMap((group) => Object.values(group).map((accounts) => accounts.bank));
+    const banksData = await (0, marginfi_sdk_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
+    const oracles = banksData
+        .map((bank) => {
+        const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.config.oracleKeys[0]);
+        return bank.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
+            ? [
+                (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
+                (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
+            ]
+            : [oracleKey];
+    })
+        .flat()
+        .map((x) => x.toString());
+    const otherAccounts = Object.entries(bankAccountsMap).flatMap(([groupName, tokenMap]) => Object.values(tokenMap).flatMap((accounts) => [
+        groupName,
+        accounts.liquidityVault,
+        accounts.vaultAuthority,
+    ]));
+    return Array.from(new Set([...banks, ...oracles, ...otherAccounts]))
+        .filter((x) => x !== web3_js_1.PublicKey.default.toString())
+        .map((x) => new web3_js_1.PublicKey(x));
+}
+async function fetchBankAddresses(umi, bankPk) {
+    const bank = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bankPk));
+    const liquidityVault = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.liquidityVault);
+    const vaultAuthority = (await (0, accountUtils_1.getTokenAccountData)(umi, liquidityVault))
+        ?.owner;
+    const priceOracle = await getMarginfiPriceOracle(umi, { data: bank });
+    return {
+        bank: bankPk,
+        liquidityVault,
+        vaultAuthority,
+        priceOracle,
+    };
+}
+async function getMarginfiPriceOracle(umi, bank) {
+    if (!bank.data) {
+        bank.data = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
+    }
+    const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
+    const priceOracle = bank.data.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
+        ? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, [
+            (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
+            (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
+        ])
+        : oracleKey;
+    return priceOracle;
+}
+function findMarginfiAccounts(bank) {
+    const search = (bankAccounts) => {
+        for (const group in bankAccounts) {
+            for (const key in bankAccounts[group]) {
+                const account = bankAccounts[group][key];
+                if (account.bank.toString().toLowerCase() ===
+                    bank.toString().toLowerCase()) {
+                    return { ...account, mint: new web3_js_1.PublicKey(key) };
+                }
+            }
+        }
+    };
+    let res = search((0, constants_1.getMarginfiAccounts)("Prod").bankAccounts);
+    if (res) {
+        return res;
+    }
+    res = search((0, constants_1.getMarginfiAccounts)("Staging").bankAccounts);
+    if (res) {
+        return res;
+    }
+    throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
+}
+async function getRemainingAccountsForMarginfiHealthCheck(umi, balance) {
+    if (!balance.active) {
+        return [];
+    }
+    const priceOracle = await getMarginfiPriceOracle(umi, {
+        pk: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(balance.bankPk),
+    });
+    return [
+        (0, solanaUtils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(balance.bankPk)),
+        (0, solanaUtils_1.getAccountMeta)(priceOracle),
+    ];
+}
+function calcMarginfiMaxLtvAndLiqThresholdBps(supplyBank, debtBank, supplyPrice) {
+    let maxLtv = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightInit.value) /
+        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightInit.value);
+    const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightMaint.value) /
+        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightMaint.value);
+    const totalDepositedUsdValue = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round((0, numberUtils_1.bytesToI80F48)(supplyBank.totalAssetShares.value) *
+        (0, numberUtils_1.bytesToI80F48)(supplyBank.assetShareValue.value))), supplyBank.mintDecimals) * supplyPrice;
+    if (supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
+        totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit) {
+        const discount = Number(supplyBank.config.totalAssetValueInitLimit) /
+            totalDepositedUsdValue;
+        maxLtv = maxLtv * Number(discount);
+    }
+    return [(0, numberUtils_1.toBps)(maxLtv, "Floor"), (0, numberUtils_1.toBps)(liqThreshold, "Floor")];
+}
+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.000001 ||
+            (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0.000001)) === undefined);
+}

package/dist/utils/marginfi/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./data";
+export * from "./general";
+//# sourceMappingURL=index.d.ts.map

package/dist/utils/marginfi/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC"}

package/dist/utils/marginfi/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./data"), exports);
+__exportStar(require("./general"), exports);

package/dist/utils/solanaUtils.js

@@ -30,7 +30,7 @@ const marginfi_sdk_1 = require("../marginfi-sdk");
 const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
 const solautoUtils_1 = require("./solautoUtils");
-const marginfiUtils_1 = require("./marginfiUtils");
+const marginfi_1 = require("./marginfi");
 function getSolanaRpcConnection(rpcUrl, programId, lpEnv) {
     const connection = new web3_js_1.Connection(rpcUrl, {
         commitment: "confirmed",
@@ -38,7 +38,7 @@ function getSolanaRpcConnection(rpcUrl, programId, lpEnv) {
     const umi = (0, umi_bundle_defaults_1.createUmi)(connection).use({
         install(umi) {
             umi.programs.add((0, solautoUtils_1.createDynamicSolautoProgram)(programId), false);
-            umi.programs.add((0, marginfiUtils_1.createDynamicMarginfiProgram)(lpEnv), false);
+            umi.programs.add((0, marginfi_1.createDynamicMarginfiProgram)(lpEnv), false);
         },
     });
     return [connection, umi];
@@ -272,7 +272,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     let cuPrice;
     if (prioritySetting !== types_1.PriorityFeeSetting.None) {
         cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
-        cuPrice = Math.min(cuPrice ?? 0, 100 * 1000000);
+        cuPrice = Math.min(cuPrice ?? 0, 100000000);
         (0, generalUtils_1.consoleLog)("Compute unit price: ", cuPrice);
     }
     if (txType !== "only-simulate") {

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

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