@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/dist/solautoPosition/utils.d.ts

@@ -0,0 +1,17 @@
+import { Umi } from "@metaplex-foundation/umi";
+import { PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../generated";
+import { PublicKey } from "@solana/web3.js";
+import { PositionCustomArgs, SolautoPositionEx } from "./solautoPositionEx";
+import { ContextUpdates } from "../utils";
+export declare function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters;
+export declare function getPositionExBulk(umi: Umi, publicKeys: PublicKey[]): Promise<SolautoPositionEx[]>;
+export declare function getOrCreatePositionEx(umi: Umi, publicKey: PublicKey, customArgs?: PositionCustomArgs, contextUpdates?: ContextUpdates): Promise<SolautoPositionEx>;
+interface AssetProps {
+    mint: PublicKey;
+    price?: number;
+    amountUsed?: number;
+    amountCanBeUsed?: number;
+}
+export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
+export {};
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAM5E,OAAO,EACL,cAAc,EAOf,MAAM,UAAU,CAAC;AAGlB,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,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAgC5B;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/utils.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSolautoSettings = createSolautoSettings;
+exports.getPositionExBulk = getPositionExBulk;
+exports.getOrCreatePositionEx = getOrCreatePositionEx;
+exports.createFakePositionState = createFakePositionState;
+const generated_1 = require("../generated");
+const web3_js_1 = require("@solana/web3.js");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const marginfiSolautoPositionEx_1 = require("./marginfiSolautoPositionEx");
+const utils_1 = require("../utils");
+const constants_1 = require("../constants");
+function createSolautoSettings(settings) {
+    return {
+        boostGap: settings.boostGap,
+        boostToBps: settings.boostToBps,
+        repayGap: settings.repayGap,
+        repayToBps: settings.repayToBps,
+        padding: [],
+    };
+}
+async function getPositionExBulk(umi, publicKeys) {
+    const batches = (0, utils_1.getBatches)(publicKeys, 30);
+    const data = (await Promise.all(batches.map(async (pubkeys) => {
+        return (0, utils_1.retryWithExponentialBackoff)(async () => await (0, generated_1.safeFetchAllSolautoPosition)(umi, pubkeys.map((x) => (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(x))));
+    }))).flat();
+    return data.map((x) => {
+        switch (x.position.lendingPlatform) {
+            case generated_1.LendingPlatform.Marginfi:
+                return new marginfiSolautoPositionEx_1.MarginfiSolautoPositionEx({
+                    umi,
+                    publicKey: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
+                    data: x,
+                });
+            // TODO: PF
+        }
+    });
+}
+async function getOrCreatePositionEx(umi, publicKey, customArgs, contextUpdates) {
+    const data = await (0, generated_1.safeFetchSolautoPosition)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(publicKey));
+    const placeholderState = createFakePositionState({
+        mint: customArgs?.supplyMint ?? web3_js_1.PublicKey.default,
+    }, { mint: customArgs?.debtMint ?? web3_js_1.PublicKey.default }, 0, 0);
+    const lendingPlatform = data
+        ? data.position.lendingPlatform
+        : customArgs.lendingPlatform;
+    switch (lendingPlatform) {
+        case generated_1.LendingPlatform.Marginfi:
+            return new marginfiSolautoPositionEx_1.MarginfiSolautoPositionEx({
+                umi,
+                publicKey,
+                data: data ?? {
+                    state: placeholderState,
+                },
+                customArgs,
+                contextUpdates,
+            });
+        // TODO: PF
+    }
+}
+function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
+    const supplyDecimals = constants_1.TOKEN_INFO[supply.mint.toString()].decimals;
+    const debtDecimals = constants_1.TOKEN_INFO[debt.mint.toString()].decimals;
+    const supplyUsd = (supply.amountUsed ?? 0) * (supply.price ?? 0);
+    const debtUsd = (debt.amountUsed ?? 0) * (debt.price ?? 0);
+    return {
+        liqUtilizationRateBps: (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, liqThresholdBps),
+        supply: {
+            amountUsed: {
+                baseUnit: (0, utils_1.toBaseUnit)(supply.amountUsed ?? 0, supplyDecimals),
+                baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)(supplyUsd),
+            },
+            amountCanBeUsed: {
+                baseUnit: (0, utils_1.toBaseUnit)(supply.amountCanBeUsed ?? 0, supplyDecimals),
+                baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)((supply.amountCanBeUsed ?? 0) * (supply.price ?? 0)),
+            },
+            baseAmountMarketPriceUsd: (0, utils_1.toRoundedUsdValue)(supply.price ?? 0),
+            borrowFeeBps: 0,
+            decimals: supplyDecimals,
+            mint: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(supply.mint),
+            padding1: [],
+            padding2: [],
+            padding: new Uint8Array([]),
+        },
+        debt: {
+            amountUsed: {
+                baseUnit: (0, utils_1.toBaseUnit)(debt.amountUsed ?? 0, debtDecimals),
+                baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)(debtUsd),
+            },
+            amountCanBeUsed: {
+                baseUnit: (0, utils_1.toBaseUnit)(debt.amountCanBeUsed ?? 0, debtDecimals),
+                baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)((debt.amountCanBeUsed ?? 0) * (debt.price ?? 0)),
+            },
+            baseAmountMarketPriceUsd: (0, utils_1.toRoundedUsdValue)(debt.price ?? 0),
+            borrowFeeBps: 0,
+            decimals: debtDecimals,
+            mint: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(debt.mint),
+            padding1: [],
+            padding2: [],
+            padding: new Uint8Array([]),
+        },
+        netWorth: {
+            baseUnit: supply.price
+                ? (0, utils_1.toBaseUnit)((supplyUsd - debtUsd) / supply.price, supplyDecimals)
+                : BigInt(0),
+            baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)(supplyUsd - debtUsd),
+        },
+        maxLtvBps,
+        liqThresholdBps,
+        lastRefreshed: BigInt((0, utils_1.currentUnixSeconds)()),
+        padding1: [],
+        padding2: [],
+        padding: [],
+    };
+}

package/dist/types/solauto.d.ts

@@ -1,6 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
-import { LendingPlatform, PositionType } from "../generated";
+import { LendingPlatform, PositionType, SolautoRebalanceType, TokenType } from "../generated";
 import { TransactionBuilder } from "@metaplex-foundation/umi";
+import { RebalanceValues } from "../services/rebalance";
+import { QuoteResponse } from "@jup-ag/api";
 export interface SolautoPositionDetails {
     publicKey?: PublicKey;
     authority: PublicKey;
@@ -27,4 +29,20 @@ export interface TransactionItemInputs {
     lookupTableAddresses?: string[];
     orderPrio?: number;
 }
+export interface FlashLoanRequirements {
+    liquiditySource: TokenType;
+    signerFlashLoan?: boolean;
+    flFeeBps?: number;
+}
+export interface FlashLoanDetails extends FlashLoanRequirements {
+    baseUnitAmount: bigint;
+    mint: PublicKey;
+}
+export interface RebalanceDetails {
+    values: RebalanceValues;
+    rebalanceType: SolautoRebalanceType;
+    flashLoan?: FlashLoanDetails;
+    swapQuote: QuoteResponse;
+    targetLiqUtilizationRateBps?: number;
+}
 //# sourceMappingURL=solauto.d.ts.map

package/dist/types/solauto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAAwC,kBAAkB,EAAE,CAAC;AAElG,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,oBAAoB,EACpB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAEhC,kBAAkB,EAAE,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC"}

package/dist/utils/generalUtils.d.ts

@@ -5,6 +5,7 @@ export declare function consoleLog(...args: any[]): void;
 export declare function tokenInfo(mint?: PublicKey): TokenInfo;
 export declare function findMintByTicker(ticker: string): PublicKey;
 export declare function tokenInfoByTicker(ticker: string): TokenInfo | undefined;
+export declare function getBatches<T>(items: T[], batchSize: number): T[][];
 export declare function generateRandomU8(): number;
 export declare function generateRandomU64(): bigint;
 export declare function currentUnixSeconds(): number;

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAGrD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,gBAuBzE"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAGrD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,CAMlE;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,gBAuBzE"}

package/dist/utils/generalUtils.js

@@ -7,6 +7,7 @@ exports.consoleLog = consoleLog;
 exports.tokenInfo = tokenInfo;
 exports.findMintByTicker = findMintByTicker;
 exports.tokenInfoByTicker = tokenInfoByTicker;
+exports.getBatches = getBatches;
 exports.generateRandomU8 = generateRandomU8;
 exports.generateRandomU64 = generateRandomU64;
 exports.currentUnixSeconds = currentUnixSeconds;
@@ -22,7 +23,7 @@ const umi_1 = require("@metaplex-foundation/umi");
 const constants_1 = require("../constants");
 const axios_1 = __importDefault(require("axios"));
 function consoleLog(...args) {
-    if (globalThis.LOCAL_TEST) {
+    if (globalThis.SHOW_LOGS) {
         console.log(...args);
     }
 }
@@ -48,6 +49,13 @@ function tokenInfoByTicker(ticker) {
     }
     return undefined;
 }
+function getBatches(items, batchSize) {
+    const batches = [];
+    for (let i = 0; i < items.length; i += batchSize) {
+        batches.push(items.slice(i, i + batchSize));
+    }
+    return batches;
+}
 function generateRandomU8() {
     return Math.floor(Math.random() * 255 + 1);
 }

package/dist/utils/index.d.ts

@@ -1,9 +1,9 @@
-export * from "./solauto/index";
 export * from "./accountUtils";
 export * from "./generalUtils";
 export * from "./jupiterUtils";
 export * from "./marginfiUtils";
 export * from "./numberUtils";
+export * from "./solautoUtils";
 export * from "./solanaUtils";
 export * from "./stringUtils";
 export * from "./priceUtils";

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,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,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,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,oBAAoB,CAAC"}

package/dist/utils/index.js

@@ -14,12 +14,12 @@ 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("./solauto/index"), exports);
 __exportStar(require("./accountUtils"), exports);
 __exportStar(require("./generalUtils"), exports);
 __exportStar(require("./jupiterUtils"), exports);
 __exportStar(require("./marginfiUtils"), exports);
 __exportStar(require("./numberUtils"), exports);
+__exportStar(require("./solautoUtils"), exports);
 __exportStar(require("./solanaUtils"), exports);
 __exportStar(require("./stringUtils"), exports);
 __exportStar(require("./priceUtils"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AA0MD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AA0MD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}

package/dist/utils/jupiterUtils.d.ts

@@ -1,31 +1,6 @@
-import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
-import { PublicKey } from "@solana/web3.js";
-import { QuoteResponse } from "@jup-ag/api";
-export interface JupSwapInput {
-    inputMint: PublicKey;
-    outputMint: PublicKey;
-    amount: bigint;
-    exactIn?: boolean;
-    exactOut?: boolean;
-}
-export interface JupSwapDetails extends JupSwapInput {
-    destinationWallet: PublicKey;
-    slippageIncFactor?: number;
-    addPadding?: boolean;
-    jupQuote?: QuoteResponse;
-    wrapAndUnwrapSol?: boolean;
-}
-export declare function getJupQuote(swapDetails: JupSwapInput): Promise<QuoteResponse>;
-export interface JupSwapTransaction {
-    jupQuote: QuoteResponse;
-    priceImpactBps: number;
-    lookupTableAddresses: string[];
-    setupInstructions: TransactionBuilder;
-    tokenLedgerIx?: TransactionBuilder;
-    swapIx: TransactionBuilder;
-    cleanupIx: TransactionBuilder;
-}
-export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails, attemptNum?: number): Promise<JupSwapTransaction>;
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { Instruction } from "@jup-ag/api";
+export declare function jupIxToSolanaIx(instruction: Instruction): TransactionInstruction;
 export declare function getJupPriceData(mints: PublicKey[]): Promise<{
     [key: string]: any;
 }>;

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,CAAC,KAAK,EAAE,SAAS,EAAE;;GA4BvD"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,GACvB,sBAAsB,CAUxB;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE;;GA4BvD"}

package/dist/utils/jupiterUtils.js

@@ -1,17 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJupQuote = getJupQuote;
-exports.getJupSwapTransaction = getJupSwapTransaction;
+exports.jupIxToSolanaIx = jupIxToSolanaIx;
 exports.getJupPriceData = getJupPriceData;
-const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
-const solanaUtils_1 = require("./solanaUtils");
-const numberUtils_1 = require("./numberUtils");
-const api_1 = require("@jup-ag/api");
-const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
-const jupApi = (0, api_1.createJupiterApiClient)();
-function createTransactionInstruction(instruction) {
+function jupIxToSolanaIx(instruction) {
     return new web3_js_1.TransactionInstruction({
         programId: new web3_js_1.PublicKey(instruction.programId),
         keys: instruction.accounts.map((key) => ({
@@ -22,70 +15,6 @@ function createTransactionInstruction(instruction) {
         data: Buffer.from(instruction.data, "base64"),
     });
 }
-async function getJupQuote(swapDetails) {
-    return await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await jupApi.quoteGet({
-        amount: Number(swapDetails.amount),
-        inputMint: swapDetails.inputMint.toString(),
-        outputMint: swapDetails.outputMint.toString(),
-        swapMode: swapDetails.exactOut
-            ? "ExactOut"
-            : swapDetails.exactIn
-                ? "ExactIn"
-                : undefined,
-        slippageBps: 300,
-        maxAccounts: !swapDetails.exactOut ? 15 + attemptNum * 5 : undefined,
-    }), 3, 200);
-}
-async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
-    const quoteResponse = swapDetails.jupQuote ?? (await getJupQuote(swapDetails));
-    const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
-    const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
-        (1 + (swapDetails.slippageIncFactor ?? 0)));
-    quoteResponse.slippageBps = finalPriceSlippageBps;
-    (0, generalUtils_1.consoleLog)("Quote:", quoteResponse);
-    (0, generalUtils_1.consoleLog)("Getting jup instructions...");
-    const instructions = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-        const res = await jupApi.swapInstructionsPost({
-            swapRequest: {
-                userPublicKey: signer.publicKey.toString(),
-                quoteResponse,
-                wrapAndUnwrapSol: swapDetails.wrapAndUnwrapSol ?? false,
-                useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
-                destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(swapDetails.destinationWallet, swapDetails.outputMint).toString(),
-            },
-        });
-        if (!res) {
-            throw new Error("No instructions retrieved");
-        }
-        return res;
-    }, 4, 200);
-    if (!instructions.swapInstruction) {
-        throw new Error("No swap instruction was returned by Jupiter");
-    }
-    (0, generalUtils_1.consoleLog)("Raw price impact bps:", priceImpactBps);
-    const finalPriceImpactBps = priceImpactBps * (1 + (swapDetails.slippageIncFactor ?? 0));
-    (0, generalUtils_1.consoleLog)("Increased price impact bps:", finalPriceImpactBps);
-    if (swapDetails.addPadding) {
-        (0, generalUtils_1.consoleLog)("Raw inAmount:", quoteResponse.inAmount);
-        const inc = Math.max((0, numberUtils_1.fromBps)(finalPriceImpactBps) * 1.1, (0, numberUtils_1.fromBps)(finalPriceSlippageBps) * 0.05);
-        (0, generalUtils_1.consoleLog)("Inc:", inc);
-        quoteResponse.inAmount = Math.round(parseInt(quoteResponse.inAmount) + parseInt(quoteResponse.inAmount) * inc).toString();
-        (0, generalUtils_1.consoleLog)("Increased inAmount:", quoteResponse.inAmount);
-    }
-    return {
-        jupQuote: quoteResponse,
-        priceImpactBps: finalPriceImpactBps,
-        lookupTableAddresses: instructions.addressLookupTableAddresses,
-        setupInstructions: (0, umi_1.transactionBuilder)().add((instructions.setupInstructions ?? []).map((ix) => (0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(ix)))),
-        tokenLedgerIx: instructions.tokenLedgerInstruction
-            ? (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.tokenLedgerInstruction)))
-            : undefined,
-        swapIx: (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.swapInstruction))),
-        cleanupIx: instructions.cleanupInstruction
-            ? (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.cleanupInstruction)))
-            : (0, umi_1.transactionBuilder)(),
-    };
-}
 async function getJupPriceData(mints) {
     const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await (await fetch("https://api.jup.ag/price/v2?ids=" +

package/dist/utils/marginfiUtils.d.ts

@@ -3,7 +3,7 @@ import { Umi } from "@metaplex-foundation/umi";
 import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
-import { ContextUpdates } from "./solauto/generalUtils";
+import { ContextUpdates } from "./solautoUtils";
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
     mint: PublicKey;
 }
@@ -16,6 +16,7 @@ export declare function getMarginfiMaxLtvAndLiqThreshold(umi: Umi, marginfiGroup
     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;
@@ -32,8 +33,8 @@ type BanksCache = {
     };
 };
 export declare function getMarginfiAccountPositionState(umi: Umi, protocolAccount: {
-    pk: PublicKey;
-    data?: MarginfiAccount;
+    pk?: PublicKey;
+    data?: MarginfiAccount | null;
 }, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, contextUpdates?: ContextUpdates): Promise<{
     supplyBank: Bank | null;
     debtBank: Bank | null;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIxD,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,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,CA4C3B;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;AAmDD,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;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,GAC9B,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,CAiMA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAIJ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,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,CA4C3B;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;AAsDD,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;AAsBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAClE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,GAC9B,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,CAyKA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}

package/dist/utils/marginfiUtils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findMarginfiAccounts = findMarginfiAccounts;
 exports.calcMarginfiMaxLtvAndLiqThreshold = calcMarginfiMaxLtvAndLiqThreshold;
 exports.getMarginfiMaxLtvAndLiqThreshold = getMarginfiMaxLtvAndLiqThreshold;
+exports.getEmptyMarginfiAccountsByAuthority = getEmptyMarginfiAccountsByAuthority;
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
 exports.getBankLiquidityAvailableBaseUnit = getBankLiquidityAvailableBaseUnit;
 exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
@@ -67,6 +68,32 @@ async function getMarginfiMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt
     }
     return calcMarginfiMaxLtvAndLiqThreshold(supply.bank, debt.bank, supplyPrice);
 }
+async function getEmptyMarginfiAccountsByAuthority(umi, authority) {
+    const marginfiAccounts = await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {
+        commitment: "confirmed",
+        filters: [
+            {
+                dataSize: (0, marginfi_sdk_1.getMarginfiAccountSize)(),
+            },
+            {
+                memcmp: {
+                    bytes: new Uint8Array(authority.toBuffer()),
+                    offset: 8 + 32, // Anchor account discriminator + group pubkey
+                },
+            },
+            {
+                // First balance is not active
+                memcmp: {
+                    bytes: new Uint8Array([0]),
+                    offset: 8 + 32 + 32,
+                },
+            },
+        ],
+    });
+    return marginfiAccounts
+        .map((x) => (0, marginfi_sdk_1.deserializeMarginfiAccount)(x))
+        .filter((x) => marginfiAccountEmpty(x));
+}
 async function getAllMarginfiAccountsByAuthority(umi, authority, group, compatibleWithSolauto) {
     const marginfiAccounts = await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {
         commitment: "confirmed",
@@ -134,12 +161,14 @@ async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
     let amountUsed = 0;
     let amountCanBeUsed = BigInt(0);
     let marketPrice = 0;
+    let originationFee = 0;
     if (bank !== null) {
         [marketPrice] = await (0, priceUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
         const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
         const shareValue = isAsset ? assetShareValue : liabilityShareValue;
         amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
         amountCanBeUsed = getBankLiquidityAvailableBaseUnit(bank, isAsset);
+        originationFee = (0, numberUtils_1.bytesToI80F48)(bank?.config.interestRateConfig.protocolOriginationFee.value);
     }
     return {
         mint: bank?.mint ?? (0, umi_1.publicKey)(web3_js_1.PublicKey.default),
@@ -158,18 +187,26 @@ async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
                 : BigInt(0),
         },
         baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(marketPrice, generalAccounts_1.USD_DECIMALS),
-        flashLoanFeeBps: 0,
-        borrowFeeBps: 0,
+        borrowFeeBps: isAsset ? 0 : (0, numberUtils_1.toBps)(originationFee),
         padding1: [],
         padding2: [],
         padding: new Uint8Array([]),
     };
 }
+async function getBank(umi, data, marginfiGroup) {
+    return data?.banksCache && data.mint && marginfiGroup
+        ? data.banksCache[marginfiGroup.toString()][data?.mint?.toString()]
+        : data?.mint && data?.mint !== web3_js_1.PublicKey.default
+            ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][data?.mint.toString()].bank), { commitment: "confirmed" })
+            : null;
+}
 async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGroup, supply, debt, contextUpdates) {
     let marginfiAccount = protocolAccount.data ??
-        (await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(protocolAccount.pk), {
-            commitment: "confirmed",
-        }));
+        (protocolAccount.pk
+            ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(protocolAccount.pk), {
+                commitment: "confirmed",
+            })
+            : null);
     if (!supply) {
         supply = {};
     }
@@ -179,16 +216,8 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
     if (!marginfiGroup && marginfiAccount) {
         marginfiGroup = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccount.group);
     }
-    let supplyBank = supply?.banksCache && supply.mint && marginfiGroup
-        ? supply.banksCache[marginfiGroup.toString()][supply?.mint?.toString()]
-        : supply?.mint && supply?.mint !== web3_js_1.PublicKey.default
-            ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][supply?.mint.toString()].bank), { commitment: "confirmed" })
-            : null;
-    let debtBank = debt?.banksCache && debt.mint && marginfiGroup
-        ? debt.banksCache[marginfiGroup.toString()][debt?.mint?.toString()]
-        : debt?.mint && debt?.mint !== web3_js_1.PublicKey.default
-            ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][debt?.mint.toString()].bank), { commitment: "confirmed" })
-            : null;
+    let supplyBank = await getBank(umi, supply, marginfiGroup);
+    let debtBank = await getBank(umi, debt, marginfiGroup);
     let supplyUsage = undefined;
     let debtUsage = undefined;
     if (marginfiAccount !== null &&
@@ -268,7 +297,7 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
             debt: debtUsage,
             maxLtvBps: (0, numberUtils_1.toBps)(maxLtv),
             liqThresholdBps: (0, numberUtils_1.toBps)(liqThreshold),
-            lastUpdated: BigInt((0, generalUtils_1.currentUnixSeconds)()),
+            lastRefreshed: BigInt((0, generalUtils_1.currentUnixSeconds)()),
             padding1: [],
             padding2: [],
             padding: [],
@@ -322,6 +351,6 @@ function getUpToDateShareValues(bank) {
 }
 function marginfiAccountEmpty(marginfiAccount) {
     return (marginfiAccount.lendingAccount.balances.find((x) => x.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
-        (Math.round((0, numberUtils_1.bytesToI80F48)(x.assetShares.value)) != 0 ||
-            Math.round((0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value)) != 0)) === undefined);
+        ((0, numberUtils_1.bytesToI80F48)(x.assetShares.value) > 0.000001 ||
+            (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0.000001)) === undefined);
 }

package/dist/utils/numberUtils.d.ts

@@ -1,4 +1,4 @@
-import { PositionState, RebalanceDirection } from "../generated";
+import { PositionState } from "../generated";
 export declare function calcNetWorthUsd(state?: PositionState): number;
 export declare function calcSupplyUsd(state?: PositionState): number;
 export declare function calcDebtUsd(state?: PositionState): number;
@@ -7,6 +7,8 @@ export declare function calcTotalSupply(state?: PositionState): number;
 export declare function calcTotalDebt(state?: PositionState): number;
 export declare function debtLiquidityUsdAvailable(state?: PositionState): number;
 export declare function supplyLiquidityUsdDepositable(state?: PositionState): number;
+export declare function fromRoundedUsdValue(number: bigint): number;
+export declare function toRoundedUsdValue(number: number): bigint;
 export declare function getLiqUtilzationRateBps(supplyUsd: number, debtUsd: number, liqThresholdBps: number): number;
 export declare function toBaseUnit(value: number, decimals: number): bigint;
 export declare function fromBaseUnit(value: bigint, decimals: number): number;
@@ -15,11 +17,6 @@ export declare function toBps(value: number): number;
 export declare function bytesToI80F48(bytes: number[]): number;
 export declare function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint;
 export declare function getDebtAdjustmentUsd(liqThresholdBps: number, supplyUsd: number, debtUsd: number, targetLiqUtilizationRateBps: number, adjustmentFeeBps?: number): number;
-export declare function getSolautoFeesBps(isReferred: boolean, targetLiqUtilizationRateBps: number | undefined, positionNetWorthUsd: number, rebalanceDirection: RebalanceDirection): {
-    solauto: number;
-    referrer: number;
-    total: number;
-};
 export declare function getMaxLiqUtilizationRateBps(maxLtvBps: number, liqThresholdBps: number, offsetFromMaxLtv: number): number;
 export declare function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number): number;
 export declare function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number): number;

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEjE,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAKhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAK9D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlE;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAejE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAW1B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,mBAAmB,EAAE,MAAM,EAC3B,kBAAkB,EAAE,kBAAkB,GACrC;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAiDA;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAIhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAI9D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,UAEjD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAE/C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAejE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAW1B;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}