@haven-fi/solauto-sdk 1.0.302 → 1.0.304

package/dist/utils/priceUtils.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchTokenPrices = fetchTokenPrices;
+exports.getPythPrices = getPythPrices;
+exports.getSwitchboardPrices = getSwitchboardPrices;
+exports.safeGetPrice = safeGetPrice;
+exports.getJupTokenPrices = getJupTokenPrices;
+const pythConstants_1 = require("../constants/pythConstants");
+const numberUtils_1 = require("./numberUtils");
+const solautoConstants_1 = require("../constants/solautoConstants");
+const switchboardConstants_1 = require("../constants/switchboardConstants");
+const generalUtils_1 = require("./generalUtils");
+const switchboardUtils_1 = require("./switchboardUtils");
+async function fetchTokenPrices(mints) {
+    const currentTime = (0, generalUtils_1.currentUnixSeconds)();
+    if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
+        currentTime - solautoConstants_1.PRICES[mint.toString()].time > 3)) {
+        return mints.map((mint) => solautoConstants_1.PRICES[mint.toString()].price);
+    }
+    const pythMints = mints.filter((x) => x.toString() in pythConstants_1.PYTH_PRICE_FEED_IDS);
+    const switchboardMints = mints.filter((x) => x.toString() in switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS);
+    const [pythData, switchboardData] = await Promise.all([
+        (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints)),
+        (0, generalUtils_1.zip)(switchboardMints, await getJupTokenPrices(switchboardMints)),
+    ]);
+    const prices = mints.map((mint) => {
+        const item = [...pythData, ...switchboardData].find((data) => data[0].equals(mint));
+        return item ? item[1] : 0;
+    });
+    for (var i = 0; i < mints.length; i++) {
+        solautoConstants_1.PRICES[mints[i].toString()] = {
+            price: prices[i],
+            time: (0, generalUtils_1.currentUnixSeconds)(),
+        };
+    }
+    return prices;
+}
+async function getPythPrices(mints) {
+    if (mints.length === 0) {
+        return [];
+    }
+    const priceFeedIds = mints.map((mint) => pythConstants_1.PYTH_PRICE_FEED_IDS[mint.toString()]);
+    const getReq = async () => await fetch(`https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`);
+    const prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        let resp = await getReq();
+        let status = resp.status;
+        if (status !== 200) {
+            throw new Error(JSON.stringify(resp));
+        }
+        const json = await resp.json();
+        const prices = json.parsed.map((x) => {
+            if (x.price.expo > 0) {
+                return Number((0, numberUtils_1.toBaseUnit)(Number(x.price.price), x.price.expo));
+            }
+            else if (x.price.expo < 0) {
+                return (0, numberUtils_1.fromBaseUnit)(BigInt(x.price.price), Math.abs(x.price.expo));
+            }
+            else {
+                return Number(x.price.price);
+            }
+        });
+        return prices;
+    }, 5, 200);
+    return prices;
+}
+async function getSwitchboardPrices(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 = (0, switchboardUtils_1.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;
+}
+function safeGetPrice(mint) {
+    if (mint && mint?.toString() in solautoConstants_1.PRICES) {
+        return solautoConstants_1.PRICES[mint.toString()].price;
+    }
+    return undefined;
+}
+async function getJupTokenPrices(mints) {
+    if (mints.length == 0) {
+        return [];
+    }
+    const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        const res = (await fetch("https://api.jup.ag/price/v2?ids=" +
+            mints.map((x) => x.toString()).join(","))).json();
+        return res;
+    }, 6);
+    const prices = Object.values(data.data).map((x) => parseFloat(x.price));
+    return prices;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAKL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsB7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA2DjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsB7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA2DjC"}

package/dist/utils/solanaUtils.js

@@ -170,7 +170,7 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     }
     return feeEstimate;
 }
-async function spamSendTransactionUntilConfirmed(connection, transaction, blockhash, spamInterval = 1000) {
+async function spamSendTransactionUntilConfirmed(connection, transaction, blockhash, spamInterval = 3000) {
     let transactionSignature = null;
     const sendTx = async () => {
         try {

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

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

package/dist/utils/solauto/generalUtils.js

@@ -24,6 +24,7 @@ const accountUtils_1 = require("../accountUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
 const marginfiUtils_1 = require("../marginfiUtils");
+const priceUtils_1 = require("../priceUtils");
 function createDynamicSolautoProgram(programId) {
     return {
         name: "solauto",
@@ -258,7 +259,7 @@ async function getAllPositionsByAuthority(conn, umi, user, positionTypeFilter) {
 }
 async function positionStateWithLatestPrices(conn, state, supplyPrice, debtPrice) {
     if (!supplyPrice || !debtPrice) {
-        [supplyPrice, debtPrice] = await (0, generalUtils_1.fetchTokenPrices)(conn, [
+        [supplyPrice, debtPrice] = await (0, priceUtils_1.fetchTokenPrices)([
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint),
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint),
         ]);

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAkI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAiDjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA0D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAiDjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA0D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -9,6 +9,7 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
 const generalUtils_2 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
 const generalAccounts_1 = require("../../constants/generalAccounts");
+const priceUtils_1 = require("../priceUtils");
 function getAdditionalAmountToDcaIn(dca) {
     if (dca.dcaInBaseUnit === BigInt(0)) {
         return 0;
@@ -118,11 +119,11 @@ function getFlashLoanDetails(client, values, jupQuote) {
     let flashLoanTokenPrice = 0;
     if (values.rebalanceDirection === generated_1.RebalanceDirection.Boost) {
         flashLoanToken = client.solautoPositionState.debt;
-        flashLoanTokenPrice = (0, generalUtils_2.safeGetPrice)(client.debtMint);
+        flashLoanTokenPrice = (0, priceUtils_1.safeGetPrice)(client.debtMint);
     }
     else {
         flashLoanToken = client.solautoPositionState.supply;
-        flashLoanTokenPrice = (0, generalUtils_2.safeGetPrice)(client.supplyMint);
+        flashLoanTokenPrice = (0, priceUtils_1.safeGetPrice)(client.supplyMint);
     }
     const exactAmountBaseUnit = jupQuote.swapMode === "ExactOut" || jupQuote.swapMode === "ExactIn"
         ? BigInt(parseInt(jupQuote.inAmount))
@@ -145,13 +146,13 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         : client.solautoPositionState.debt;
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) +
         (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
-    const inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, generalUtils_2.safeGetPrice)(input.mint), input.decimals);
+    const inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(input.mint), input.decimals);
     const outputAmount = targetLiqUtilizationRateBps === 0
         ? output.amountUsed.baseUnit +
             BigInt(Math.round(Number(output.amountUsed.baseUnit) *
                 // Add this small percentage to account for the APR on the debt between now and the transaction
                 0.0001))
-        : (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, generalUtils_2.safeGetPrice)(output.mint), output.decimals);
+        : (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(output.mint), output.decimals);
     const exactOut = targetLiqUtilizationRateBps === 0 || values.repayingCloseToMaxLtv;
     const exactIn = !exactOut;
     return {

package/dist/utils/switchboardUtils.d.ts

@@ -0,0 +1,7 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+import { PullFeed } from "@switchboard-xyz/on-demand";
+import { TransactionItemInputs } from "../types";
+import { Signer } from "@metaplex-foundation/umi";
+export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): PullFeed;
+export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
+//# 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":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAkB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAMtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,YAsBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAiB5C"}

package/dist/utils/switchboardUtils.js

@@ -0,0 +1,41 @@
+"use strict";
+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;
+const anchor_1 = require("@coral-xyz/anchor");
+const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
+const web3_js_1 = require("@solana/web3.js");
+const on_demand_1 = require("@switchboard-xyz/on-demand");
+const switchboardConstants_1 = require("../constants/switchboardConstants");
+const umi_1 = require("@metaplex-foundation/umi");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+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);
+    return new on_demand_1.PullFeed(program, new web3_js_1.PublicKey(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()]));
+}
+async function buildSwbSubmitResponseTx(conn, signer, mint) {
+    const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
+    const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    const [pullIx, responses] = await feed.fetchUpdateIx({
+        crossbarClient: crossbar,
+    });
+    return {
+        tx: (0, umi_1.transactionBuilder)().add({
+            bytesCreatedOnChain: 0,
+            instruction: (0, umi_web3js_adapters_1.fromWeb3JsInstruction)(pullIx),
+            signers: [signer],
+        }),
+        lookupTableAddresses: responses
+            .filter((x) => Boolean(x.oracle.lut?.key))
+            .map((x) => x.oracle.lut.key.toString()),
+    };
+}

package/local/createISMAccounts.ts

@@ -0,0 +1,59 @@
+import {
+  createSignerFromKeypair,
+  publicKey,
+  signerIdentity,
+  transactionBuilder,
+} from "@metaplex-foundation/umi";
+import {
+  buildHeliusApiUrl,
+  getSolanaRpcConnection,
+  sendSingleOptimizedTransaction,
+} from "../src/utils/solanaUtils";
+import { marginfiAccountInitialize, safeFetchAllMarginfiAccount } from "../src/marginfi-sdk";
+import { MARGINFI_ACCOUNTS, SOLAUTO_MANAGER } from "../src/constants";
+import { getSecretKey } from "./shared";
+import { updateSolautoLut } from "./updateSolautoLUT";
+import { getAllMarginfiAccountsByAuthority } from "../src/utils";
+
+async function createIntermediarySolautoManagerAccounts() {
+  let [connection, umi] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY!));
+
+  const secretKey = getSecretKey("solauto-manager");
+  const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
+  const signer = createSignerFromKeypair(umi, signerKeypair);
+
+  umi = umi.use(signerIdentity(signer));
+
+  const accounts = await getAllMarginfiAccountsByAuthority(connection, umi, SOLAUTO_MANAGER, false);
+  const data = await safeFetchAllMarginfiAccount(umi, accounts.map(x => publicKey(x.marginfiAccount)));
+  const existingMarginfiGroups = data.map(x => x.group.toString());
+
+  for (const group of Object.keys(MARGINFI_ACCOUNTS)) {
+    if (existingMarginfiGroups.includes(group.toString())) {
+      console.log("Already have Solauto Manager Marginfi Account for group:", group);
+      continue;
+    }
+
+    const marginfiAccount = createSignerFromKeypair(
+      umi,
+      umi.eddsa.generateKeypair()
+    );
+
+    const tx = marginfiAccountInitialize(umi, {
+      marginfiAccount,
+      marginfiGroup: publicKey(group),
+      authority: signer,
+      feePayer: signer,
+    });
+  
+    await sendSingleOptimizedTransaction(
+      umi,
+      connection,
+      transactionBuilder().add(tx)
+    );
+
+    await updateSolautoLut([marginfiAccount.publicKey.toString()]);
+  }
+}
+
+createIntermediarySolautoManagerAccounts();

package/local/updateMarginfiLUT.ts

@@ -15,7 +15,6 @@ async function addBanks() {
       const accounts = MARGINFI_ACCOUNTS[group][key];
       await updateLookupTable(
         [
-          key,
           accounts.bank,
           accounts.liquidityVault,
           accounts.vaultAuthority,

package/local/updateSolautoLUT.ts

@@ -1,24 +1,55 @@
 import { PublicKey } from "@solana/web3.js";
 import { getTokenAccounts } from "../src/utils/accountUtils";
-import { SOLAUTO_FEES_WALLET, SOLAUTO_MANAGER } from "../src/constants/generalAccounts";
+import {
+  SOLAUTO_FEES_WALLET,
+  SOLAUTO_MANAGER,
+} from "../src/constants/generalAccounts";
 import { ALL_SUPPORTED_TOKENS } from "../src/constants/tokenConstants";
 import { updateLookupTable } from "./shared";
-import { SOLAUTO_LUT, STANDARD_LUT_ACCOUNTS } from "../src/constants/solautoConstants";
+import {
+  SOLAUTO_LUT,
+  STANDARD_LUT_ACCOUNTS,
+} from "../src/constants/solautoConstants";
+import {
+  buildHeliusApiUrl,
+  getAllMarginfiAccountsByAuthority,
+  getSolanaRpcConnection,
+} from "../src/utils";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "../src/constants/switchboardConstants";
 
 const LOOKUP_TABLE_ADDRESS = new PublicKey(SOLAUTO_LUT);
-const solautoManagerTokenAccounts = getTokenAccounts(SOLAUTO_MANAGER, ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x)));
-const solautoFeeWalletTokenAccounts = getTokenAccounts(SOLAUTO_FEES_WALLET, ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x)));
+const solautoManagerTokenAccounts = getTokenAccounts(
+  SOLAUTO_MANAGER,
+  ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x))
+);
+const solautoFeeWalletTokenAccounts = getTokenAccounts(
+  SOLAUTO_FEES_WALLET,
+  ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x))
+);
 
 export async function updateSolautoLut(additionalAccounts?: string[]) {
+  const [connection, umi] = getSolanaRpcConnection(
+    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+  );
+  const ismAccounts = await getAllMarginfiAccountsByAuthority(
+    connection,
+    umi,
+    SOLAUTO_MANAGER,
+    false
+  );
+
   return updateLookupTable(
     [
       ...STANDARD_LUT_ACCOUNTS,
+      ...ALL_SUPPORTED_TOKENS,
       ...solautoManagerTokenAccounts.map((x) => x.toString()),
-      ...solautoFeeWalletTokenAccounts.map(x => x.toString()),
-      ...(additionalAccounts ?? [])
+      ...solautoFeeWalletTokenAccounts.map((x) => x.toString()),
+      ...ismAccounts.map((x) => x.marginfiAccount.toString()),
+      ...Object.values(SWITCHBOARD_PRICE_FEED_IDS),
+      ...(additionalAccounts ?? []),
     ],
     LOOKUP_TABLE_ADDRESS
   );
 }
 
-updateSolautoLut();
+updateSolautoLut();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.302",
+  "version": "1.0.304",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -13,6 +13,7 @@
     "test:all": "pnpm test:unit && pnpm test:txs",
     "update-lut:solauto": "npx ts-node local/updateSolautoLUT.ts",
     "update-lut:marginfi": "npx ts-node local/updateMarginfiLUT.ts",
+    "create-ism-accounts": "npx ts-node local/createISMAccounts.ts",
     "create-fee-accounts": "npx ts-node local/createFeeAccounts.ts"
   },
   "dependencies": {

package/src/clients/solautoMarginfiClient.ts

@@ -33,12 +33,8 @@ import {
   marginfiRebalance,
   marginfiRefreshData,
 } from "../generated";
-import {
-  getMarginfiAccountPDA,
-  getReferralState,
-  getTokenAccount,
-} from "../utils/accountUtils";
-import { generateRandomU64, safeGetPrice } from "../utils/generalUtils";
+import { getMarginfiAccountPDA, getTokenAccount } from "../utils/accountUtils";
+import { generateRandomU64 } from "../utils/generalUtils";
 import {
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
@@ -64,6 +60,7 @@ import {
 } from "../utils/marginfiUtils";
 import { bytesToI80F48, fromBaseUnit, toBps } from "../utils/numberUtils";
 import { QuoteResponse } from "@jup-ag/api";
+import { safeGetPrice } from "../utils";
 
 export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
   marginfiAccount?: PublicKey | Signer;
@@ -104,7 +101,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     } else {
       this.marginfiAccountSeedIdx = generateRandomU64();
       this.marginfiAccount = this.solautoPositionData
-        ? toWeb3JsPublicKey(this.solautoPositionData.position.protocolUserAccount)
+        ? toWeb3JsPublicKey(
+            this.solautoPositionData.position.protocolUserAccount
+          )
         : getMarginfiAccountPDA(
             this.solautoPosition,
             this.marginfiAccountSeedIdx,
@@ -169,7 +168,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       .sort((a, b) =>
         a.marginfiAccount.toString().localeCompare(b.marginfiAccount.toString())
       );
-    const emptyMarginfiAccounts =
+    const compatibleMarginfiAccounts =
       existingMarginfiAccounts.length > 0
         ? (
             await safeFetchAllMarginfiAccount(
@@ -178,6 +177,7 @@ export class SolautoMarginfiClient extends SolautoClient {
             )
           ).filter(
             (x) =>
+              x.group.toString() === this.marginfiGroup.toString() &&
               x.lendingAccount.balances.find(
                 (y) =>
                   y.bankPk.toString() !== PublicKey.default.toString() &&
@@ -188,15 +188,17 @@ export class SolautoMarginfiClient extends SolautoClient {
         : [];
 
     this.intermediaryMarginfiAccountSigner =
-      emptyMarginfiAccounts.length > 0
+      compatibleMarginfiAccounts.length > 0
         ? undefined
         : createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
     this.intermediaryMarginfiAccountPk =
-      emptyMarginfiAccounts.length > 0
-        ? toWeb3JsPublicKey(emptyMarginfiAccounts[0].publicKey)
+      compatibleMarginfiAccounts.length > 0
+        ? toWeb3JsPublicKey(compatibleMarginfiAccounts[0].publicKey)
         : toWeb3JsPublicKey(this.intermediaryMarginfiAccountSigner!.publicKey);
     this.intermediaryMarginfiAccount =
-      emptyMarginfiAccounts.length > 0 ? emptyMarginfiAccounts[0] : undefined;
+      compatibleMarginfiAccounts.length > 0
+        ? compatibleMarginfiAccounts[0]
+        : undefined;
   }
 
   protocolAccount(): PublicKey {
@@ -228,7 +230,6 @@ export class SolautoMarginfiClient extends SolautoClient {
       return [0, 0];
     } else {
       const [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
-        this.connection,
         this.umi,
         this.marginfiGroup,
         {
@@ -244,9 +245,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     }
   }
 
-  marginfiAccountInitialize(): TransactionBuilder {
+  marginfiAccountInitialize(marginfiAccount: Signer): TransactionBuilder {
     return marginfiAccountInitialize(this.umi, {
-      marginfiAccount: this.marginfiAccount as Signer,
+      marginfiAccount: marginfiAccount,
       marginfiGroup: publicKey(this.marginfiGroup),
       authority: this.signer,
       feePayer: this.signer,
@@ -567,7 +568,7 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVaultAuthority: publicKey(bank.vaultAuthority),
           destinationTokenAccount: publicKey(destinationTokenAccount),
           marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
-          marginfiGroup: publicKey(DEFAULT_MARGINFI_GROUP),
+          marginfiGroup: publicKey(this.marginfiGroup),
           signer: this.signer,
         })
       );
@@ -639,7 +640,7 @@ export class SolautoMarginfiClient extends SolautoClient {
           bank: publicKey(accounts.data.bank),
           bankLiquidityVault: publicKey(accounts.data.liquidityVault),
           marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
-          marginfiGroup: publicKey(DEFAULT_MARGINFI_GROUP),
+          marginfiGroup: publicKey(this.marginfiGroup),
           signer: this.signer,
           signerTokenAccount: publicKey(
             getTokenAccount(
@@ -657,15 +658,6 @@ export class SolautoMarginfiClient extends SolautoClient {
       );
   }
 
-  createIntermediaryMarginfiAccount(): TransactionBuilder {
-    return marginfiAccountInitialize(this.umi, {
-      marginfiAccount: this.intermediaryMarginfiAccountSigner!,
-      marginfiGroup: publicKey(DEFAULT_MARGINFI_GROUP),
-      authority: this.signer,
-      feePayer: this.signer,
-    });
-  }
-
   async getFreshPositionState(): Promise<PositionState | undefined> {
     const state = await super.getFreshPositionState();
     if (state) {
@@ -678,7 +670,6 @@ export class SolautoMarginfiClient extends SolautoClient {
         !toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority));
 
     const freshState = await getMarginfiAccountPositionState(
-      this.connection,
       this.umi,
       { pk: this.marginfiAccountPk },
       this.marginfiGroup,

package/src/constants/README.md

@@ -1,5 +1,3 @@
-TODO: move this to main readme in root folder when that's ready
-
 Instructions for supporting new token:
 
 - add public key to tokenConstants.ts

package/src/transactions/transactionUtils.ts

@@ -1,6 +1,7 @@
 import {
   Instruction,
   ProgramError,
+  Signer,
   TransactionBuilder,
   Umi,
   publicKey,
@@ -42,7 +43,6 @@ import {
   currentUnixSeconds,
   getSolanaAccountCreated,
   rpcAccountCreated,
-  safeGetPrice,
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
 import {
@@ -71,6 +71,7 @@ import {
 } from "../jupiter-sdk";
 import { PRICES } from "../constants";
 import { TransactionItemInputs } from "../types";
+import { safeGetPrice } from "../utils";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -161,7 +162,9 @@ async function transactionChoresBefore(
       ))
     ) {
       chores = chores.add(
-        (client as SolautoMarginfiClient).marginfiAccountInitialize()
+        (client as SolautoMarginfiClient).marginfiAccountInitialize(
+          (client as SolautoMarginfiClient).marginfiAccount as Signer
+        )
       );
     }
     // TODO: PF
@@ -335,7 +338,9 @@ export async function rebalanceChoresBefore(
   ) {
     client.log("Creating intermediary marginfi account");
     chores = chores.add(
-      (client as SolautoMarginfiClient).createIntermediaryMarginfiAccount()
+      (client as SolautoMarginfiClient).marginfiAccountInitialize(
+        (client as SolautoMarginfiClient).intermediaryMarginfiAccountSigner!
+      )
     );
   }
 

package/src/transactions/transactionsManager.ts

@@ -23,8 +23,12 @@ import {
   TransactionRunType,
 } from "../types";
 import { ReferralStateManager, TxHandler } from "../clients";
-import { TransactionExpiredBlockheightExceededError } from "@solana/web3.js";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import {
+  PublicKey,
+  TransactionExpiredBlockheightExceededError,
+} from "@solana/web3.js";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
+import { buildSwbSubmitResponseTx, getSwitchboardPrices } from "../utils";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
 const CHORES_TX_NAME = "account chores";
@@ -386,6 +390,33 @@ export class TransactionsManager {
       await item.initialize();
     }
 
+    const allAccounts = items.flatMap((x) =>
+      x.tx
+        ?.getInstructions()
+        .flatMap((x) => x.keys.map((x) => x.pubkey.toString()))
+    );
+    const swbOracle = allAccounts.find((x) =>
+      Object.values(SWITCHBOARD_PRICE_FEED_IDS).includes(x ?? "")
+    );
+    if (swbOracle) {
+      const mint = new PublicKey(
+        Object.keys(SWITCHBOARD_PRICE_FEED_IDS).find(
+          (x) => SWITCHBOARD_PRICE_FEED_IDS[x] === swbOracle
+        )!
+      );
+      const stale = (await getSwitchboardPrices(client.connection, [mint]))[0]
+        .stale;
+
+      if (stale) {
+        const swbTx = new TransactionItem(
+          async () =>
+            buildSwbSubmitResponseTx(client.connection, client.signer, mint),
+          items.length === 1 ? "Update oracle" : ""
+        );
+        items.unshift(swbTx);
+      }
+    }
+
     let [choresBefore, choresAfter] = await getTransactionChores(
       client,
       transactionBuilder().add(