@haven-fi/solauto-sdk 1.0.672 → 1.0.673

package/dist/index.d.ts

@@ -0,0 +1,12 @@
+export * from "./constants";
+export * from "./generated/accounts";
+export * from "./generated/instructions";
+export * from "./generated/types";
+export * from "./marginfi-sdk/accounts";
+export * from "./marginfi-sdk/instructions";
+export * from "./marginfi-sdk/types";
+export * from "./services";
+export * from "./solautoPosition";
+export * from "./types";
+export * from "./utils";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -0,0 +1,27 @@
+"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("./constants"), exports);
+__exportStar(require("./generated/accounts"), exports);
+__exportStar(require("./generated/instructions"), exports);
+__exportStar(require("./generated/types"), exports);
+__exportStar(require("./marginfi-sdk/accounts"), exports);
+__exportStar(require("./marginfi-sdk/instructions"), exports);
+__exportStar(require("./marginfi-sdk/types"), exports);
+__exportStar(require("./services"), exports);
+__exportStar(require("./solautoPosition"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./utils"), exports);

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -9,6 +9,9 @@ export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     getBanks(): Promise<Bank[]>;
     priceOracles(): Promise<PublicKey[]>;
     maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
+    private getUpToDateLiquidityAvailable;
+    updateSupplyLiquidityDepositable(banks: Bank[]): void;
+    updateDebtLiquidityAvailable(banks: Bank[]): void;
     get supplyLiquidityAvailable(): number;
     refreshPositionState(priceType?: PriceType): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAoB,MAAM,iBAAiB,CAAC;AAYzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAE3C,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAE/B,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAgB3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAuBjE"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAoB,MAAM,iBAAiB,CAAC;AAezD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAE3C,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAE/B,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAgB3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAuBjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -40,6 +40,23 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         const [maxLtvBps, liqThresholdBps] = (0, utils_1.calcMarginfiMaxLtvAndLiqThresholdBps)(supplyBank, debtBank, supplyPrice);
         return [maxLtvBps, liqThresholdBps];
     }
+    getUpToDateLiquidityAvailable(banks, mint, availableToDeposit) {
+        const bank = banks.find((x) => x.group.toString() === this.lpPoolAccount.toString() &&
+            x.mint.toString() === mint.toString());
+        const baseUnit = (0, utils_1.getBankLiquidityAvailableBaseUnit)(bank, availableToDeposit);
+        return {
+            baseUnit: baseUnit,
+            baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)((0, utils_1.fromBaseUnit)(baseUnit, (0, utils_1.tokenInfo)(mint).decimals) *
+                ((0, utils_1.safeGetPrice)(mint) ?? 0)),
+        };
+    }
+    updateSupplyLiquidityDepositable(banks) {
+        this._data.state.supply.amountCanBeUsed =
+            this.getUpToDateLiquidityAvailable(banks, this.supplyMint, true);
+    }
+    updateDebtLiquidityAvailable(banks) {
+        this._data.state.debt.amountCanBeUsed = this.getUpToDateLiquidityAvailable(banks, this.debtMint, false);
+    }
     get supplyLiquidityAvailable() {
         return (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.supplyMintInfo.decimals);
     }

package/dist/utils/index.d.ts

@@ -0,0 +1,14 @@
+export * from "./accountUtils";
+export * from "./generalUtils";
+export * from "./instructionUtils";
+export * from "./jitoUtils";
+export * from "./jupiterUtils";
+export * from "./marginfi";
+export * from "./numberUtils";
+export * from "./solautoUtils";
+export * from "./solanaUtils";
+export * from "./stringUtils";
+export * from "./priceUtils";
+export * from "./pythUtils";
+export * from "./switchboardUtils";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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,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

@@ -0,0 +1,29 @@
+"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("./accountUtils"), exports);
+__exportStar(require("./generalUtils"), exports);
+__exportStar(require("./instructionUtils"), exports);
+__exportStar(require("./jitoUtils"), exports);
+__exportStar(require("./jupiterUtils"), exports);
+__exportStar(require("./marginfi"), exports);
+__exportStar(require("./numberUtils"), exports);
+__exportStar(require("./solautoUtils"), exports);
+__exportStar(require("./solanaUtils"), exports);
+__exportStar(require("./stringUtils"), exports);
+__exportStar(require("./priceUtils"), exports);
+__exportStar(require("./pythUtils"), exports);
+__exportStar(require("./switchboardUtils"), exports);

package/dist/utils/switchboardUtils.d.ts

@@ -0,0 +1,12 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Signer } from "@metaplex-foundation/umi";
+import * as OnDemand from "@switchboard-xyz/on-demand";
+import { TransactionItemInputs } from "../types";
+export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): OnDemand.PullFeed;
+export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
+export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{
+    mint: PublicKey;
+    price: number;
+    stale: boolean;
+}[]>;
+//# sourceMappingURL=switchboardUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAIjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}

package/dist/utils/switchboardUtils.js

@@ -0,0 +1,81 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPullFeed = getPullFeed;
+exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
+exports.getSwitchboardFeedData = getSwitchboardFeedData;
+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 anchor_1 = require("@coral-xyz/anchor");
+const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
+const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
+const constants_1 = require("../constants");
+const generalUtils_1 = require("./generalUtils");
+const solanaUtils_1 = require("./solanaUtils");
+function getPullFeed(conn, mint, wallet) {
+    const dummyWallet = {
+        publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
+        signTransaction: async (tx) => tx,
+        signAllTransactions: async (txs) => txs,
+    };
+    const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
+    const program = new anchor_1.Program(switchboard_json_1.default, provider);
+    const { PullFeed } = OnDemand;
+    return new PullFeed(program, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
+}
+async function buildSwbSubmitResponseTx(conn, signer, mint) {
+    const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await feed.fetchUpdateIx({
+        chain: "solana",
+        network: "mainnet-beta",
+    }), 2, 200);
+    if (!pullIx) {
+        throw new Error("Unable to fetch SWB crank IX");
+    }
+    return {
+        tx: (0, umi_1.transactionBuilder)([(0, solanaUtils_1.getWrappedInstruction)(signer, pullIx)]),
+        lookupTableAddresses: responses
+            .filter((x) => Boolean(x.oracle.lut?.key))
+            .map((x) => x.oracle.lut.key.toString()),
+    };
+}
+async function getSwitchboardFeedData(conn, mints) {
+    if (mints.length === 0) {
+        return [];
+    }
+    const currSlot = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await conn.getSlot("confirmed"), 5);
+    const results = await Promise.all(mints.map(async (mint) => {
+        const feed = getPullFeed(conn, mint);
+        const result = await feed.loadData();
+        const price = Number(result.result.value) / Math.pow(10, 18);
+        const stale = currSlot > result.result.slot.toNumber() + result.maxStaleness;
+        return { mint, price, stale };
+    }));
+    return results;
+}

package/package.json

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

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -8,6 +8,9 @@ import {
   getBankLiquidityAvailableBaseUnit,
   getMarginfiAccountPositionState,
   getMarginfiPriceOracle,
+  safeGetPrice,
+  tokenInfo,
+  toRoundedUsdValue,
   validPubkey,
 } from "../utils";
 import { getMarginfiAccounts } from "../constants";
@@ -58,6 +61,43 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     return [maxLtvBps, liqThresholdBps];
   }
 
+  private getUpToDateLiquidityAvailable(
+    banks: Bank[],
+    mint: PublicKey,
+    availableToDeposit: boolean
+  ) {
+    const bank = banks.find(
+      (x) =>
+        x.group.toString() === this.lpPoolAccount.toString() &&
+        x.mint.toString() === mint.toString()
+    );
+
+    const baseUnit = getBankLiquidityAvailableBaseUnit(
+      bank!,
+      availableToDeposit
+    );
+    return {
+      baseUnit: baseUnit,
+      baseAmountUsdValue: toRoundedUsdValue(
+        fromBaseUnit(baseUnit, tokenInfo(mint).decimals) *
+          (safeGetPrice(mint) ?? 0)
+      ),
+    };
+  }
+
+  updateSupplyLiquidityDepositable(banks: Bank[]) {
+    this._data.state.supply.amountCanBeUsed =
+      this.getUpToDateLiquidityAvailable(banks, this.supplyMint, true);
+  }
+
+  updateDebtLiquidityAvailable(banks: Bank[]) {
+    this._data.state.debt.amountCanBeUsed = this.getUpToDateLiquidityAvailable(
+      banks,
+      this.debtMint,
+      false
+    );
+  }
+
   get supplyLiquidityAvailable(): number {
     return fromBaseUnit(
       getBankLiquidityAvailableBaseUnit(this.supplyBank, false),

package/tests/transactions/shared.ts

@@ -21,6 +21,7 @@ import {
   rebalance,
   withdraw,
   closeSolautoPosition,
+  getMarginfiAccounts,
 } from "../../src";
 
 export async function e2eTransactionTest(
@@ -42,6 +43,7 @@ export async function e2eTransactionTest(
 
   await client.initialize({
     positionId: 1,
+    lpPoolAccount: getMarginfiAccounts().defaultGroup,
     supplyMint,
     debtMint,
   });

package/tests/unit/rebalanceCalculations.ts

@@ -20,6 +20,7 @@ import {
   SolautoFeesBps,
   createFakePositionState,
   MarginfiSolautoPositionEx,
+  getMarginfiAccounts,
 } from "../../src";
 
 const signer = setupTest(undefined, true);
@@ -65,6 +66,7 @@ async function getFakePosition(
   });
   await client.initialize({
     positionId: 1,
+    lpPoolAccount: getMarginfiAccounts().defaultGroup,
     supplyMint: new PublicKey(NATIVE_MINT),
     debtMint: new PublicKey(USDC),
   });
@@ -105,8 +107,8 @@ async function getFakePosition(
         lpUserAccount: defaultPk,
         lpSupplyAccount: defaultPk,
         lpDebtAccount: defaultPk,
+        lpPoolAccount: defaultPk,
         settings,
-        dca: null,
         padding: [],
         padding1: [],
       },