@haven-fi/solauto-sdk 1.0.687 → 1.0.689

package/dist/services/transactions/manager/clientTransactionsManager.js

@@ -25,8 +25,8 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
         ];
         if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
             this.txHandler.log("Requires oracle update(s)...");
-            const txs = switchboardMints.map((x) => new types_1.TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
-            txs.unshift(...txs);
+            const oracleTxs = switchboardMints.map((x) => new types_1.TransactionItem(async () => await (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
+            txs.unshift(...oracleTxs);
         }
     }
     async addChoreTxs(txs, updateLutTx) {

package/dist/services/transactions/manager/transactionsManager.js

@@ -260,7 +260,9 @@ class TransactionsManager {
         }
         else {
             await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
-            await Promise.all(itemSets.map((itemSet) => itemSet.refetchAll(attemptNum, prevError)));
+            for (const itemSet of itemSets) {
+                await itemSet.refetchAll(attemptNum, prevError);
+            }
         }
         const newItemSets = await this.assembleTransactionSets(currentIndex !== undefined
             ? [

package/dist/utils/generalUtils.d.ts

@@ -21,4 +21,5 @@ export declare function toEnumValue<E extends object>(enumObj: E, value: number)
 export declare function customRpcCall(umi: Umi, method: string, params?: any): Promise<any>;
 export declare function u16ToArrayBufferLE(value: number): Uint8Array;
 export declare function validPubkey(pubkey?: PublicKey | UmiPublicKey | string): boolean;
+export declare function createRecord<T>(keys: string[], values: T[]): Record<string, T>;
 //# sourceMappingURL=generalUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,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;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,WAErE"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,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;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,WAErE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAI9E"}

package/dist/utils/generalUtils.js

@@ -22,6 +22,7 @@ exports.toEnumValue = toEnumValue;
 exports.customRpcCall = customRpcCall;
 exports.u16ToArrayBufferLE = u16ToArrayBufferLE;
 exports.validPubkey = validPubkey;
+exports.createRecord = createRecord;
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
@@ -173,3 +174,6 @@ function u16ToArrayBufferLE(value) {
 function validPubkey(pubkey) {
     return Boolean(pubkey) && pubkey.toString() !== web3_js_1.PublicKey.default.toString();
 }
+function createRecord(keys, values) {
+    return Object.fromEntries(zip(keys, values).map(([k, v]) => [k.toString(), v]));
+}

package/dist/utils/priceUtils.d.ts

@@ -6,9 +6,9 @@ interface PriceResult {
     emaPrice?: number;
 }
 export declare function fetchTokenPrices(mints: PublicKey[], priceType?: PriceType): Promise<number[]>;
-export declare function getPythPrices(mints: PublicKey[], priceType: PriceType): Promise<PriceResult[]>;
-export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<PriceResult[]>;
-export declare function getJupTokenPrices(mints: PublicKey[]): Promise<PriceResult[]>;
+export declare function getPythPrices(mints: PublicKey[]): Promise<Record<string, PriceResult>>;
+export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<Record<string, PriceResult>>;
+export declare function getJupTokenPrices(mints: PublicKey[]): Promise<Record<string, PriceResult>>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | string | undefined, priceType?: PriceType): number | undefined;
 export {};
 //# sourceMappingURL=priceUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAerE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,GACxC,OAAO,CAAC,MAAM,EAAE,CAAC,CAoDnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC,CA+CxB;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CA0DxB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CAgBxB;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,GACxC,MAAM,GAAG,SAAS,CAQpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAerE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,GACxC,OAAO,CAAC,MAAM,EAAE,CAAC,CAkDnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CA+CtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,GACxC,MAAM,GAAG,SAAS,CAQpB"}

package/dist/utils/priceUtils.js

@@ -37,42 +37,42 @@ const jupiterUtils_1 = require("./jupiterUtils");
 const generated_1 = require("../generated");
 async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtime) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
-    if (!mints.some((mint) => !(mint.toString() in constants_1.PRICES) ||
-        currentTime - constants_1.PRICES[mint.toString()].time > 3)) {
-        return mints.map((mint) => {
-            const priceData = constants_1.PRICES[mint.toString()];
-            return priceType === generated_1.PriceType.Ema
-                ? priceData.emaPrice
-                : priceData.realtimePrice;
-        });
-    }
-    const pythMints = mints.filter((x) => x.toString() in constants_1.PYTH_PRICE_FEED_IDS);
-    const switchboardMints = mints.filter((x) => x.toString() in Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS));
-    const otherMints = mints.filter((x) => !pythMints.includes(x) && !switchboardMints.includes(x));
-    const [pythData, switchboardData, jupData] = await Promise.all([
-        (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints, priceType)),
-        (0, generalUtils_1.zip)(switchboardMints, await getSwitchboardPrices(switchboardMints)),
-        (0, generalUtils_1.zip)(otherMints, await getJupTokenPrices(otherMints)),
-    ]);
-    const prices = mints.map((mint) => {
-        const item = [...pythData, ...switchboardData, ...jupData].find((data) => data[0].equals(mint));
-        return item ? item[1] : { realtimePrice: 0 };
-    });
-    for (var i = 0; i < mints.length; i++) {
-        const realtimePrice = prices[i].realtimePrice;
-        constants_1.PRICES[mints[i].toString()] = {
+    const mintStrs = mints.map((x) => x.toString());
+    const cachedPrices = Object.fromEntries(Object.entries(constants_1.PRICES).filter(([mint, price]) => mintStrs.includes(mint) && currentTime - price.time <= 3));
+    const newMints = mintStrs
+        .filter((x) => !Object.keys(cachedPrices).includes(x))
+        .map((x) => new web3_js_1.PublicKey(x));
+    const pythMints = newMints.filter((x) => x.toString() in constants_1.PYTH_PRICE_FEED_IDS);
+    const switchboardMints = newMints.filter((x) => x.toString() in Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS));
+    const otherMints = newMints.filter((x) => !pythMints.includes(x) && !switchboardMints.includes(x));
+    const newPrices = Object.assign({}, ...(await Promise.all([
+        getPythPrices(pythMints),
+        getSwitchboardPrices(switchboardMints),
+        getJupTokenPrices(otherMints),
+    ])));
+    for (const mint of newMints) {
+        const realtimePrice = newPrices[mint.toString()].realtimePrice;
+        constants_1.PRICES[mint.toString()] = {
             realtimePrice,
-            emaPrice: prices[i].emaPrice ?? realtimePrice,
+            emaPrice: newPrices[mint.toString()].emaPrice ?? realtimePrice,
             time: (0, generalUtils_1.currentUnixSeconds)(),
         };
     }
-    return prices.map((x) => priceType === generated_1.PriceType.Ema
-        ? (x.emaPrice ?? x.realtimePrice)
-        : x.realtimePrice);
+    const prices = {
+        ...constants_1.PRICES,
+        ...newPrices,
+    };
+    return mints.map((x) => {
+        const priceResult = prices[x.toString()];
+        const realtimePrice = priceResult.realtimePrice;
+        return priceType === generated_1.PriceType.Ema
+            ? (priceResult.emaPrice ?? realtimePrice)
+            : realtimePrice;
+    });
 }
-async function getPythPrices(mints, priceType) {
+async function getPythPrices(mints) {
     if (mints.length === 0) {
-        return [];
+        return {};
     }
     const priceFeedIds = mints.map((mint) => constants_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("&")}`);
@@ -102,7 +102,7 @@ async function getPythPrices(mints, priceType) {
         });
         return prices;
     }, 5, 200);
-    return prices;
+    return (0, generalUtils_1.createRecord)(mints.map((x) => x.toString()), prices);
 }
 function getSortedPriceData(prices, mints) {
     const sortedPrices = {};
@@ -116,7 +116,7 @@ function getSortedPriceData(prices, mints) {
 }
 async function getSwitchboardPrices(mints) {
     if (mints.length === 0) {
-        return [];
+        return {};
     }
     const { CrossbarClient } = SwbCommon;
     const crossbar = CrossbarClient.default();
@@ -133,7 +133,7 @@ async function getSwitchboardPrices(mints) {
             for (const item of resp) {
                 for (const [k, v] of Object.entries(constants_1.SWITCHBOARD_PRICE_FEED_IDS)) {
                     if (item.feedHash === v.feedHash) {
-                        finalMap[k] = Number(item.results[0]);
+                        finalMap[k] = { realtimePrice: Number(item.results[0]) };
                     }
                 }
             }
@@ -144,25 +144,21 @@ async function getSwitchboardPrices(mints) {
         (0, generalUtils_1.consoleLog)("Failed to fetch Switchboard prices after multiple retries");
     }
     const missingMints = mints.filter((x) => !prices[x.toString()]);
-    const jupPrices = (0, generalUtils_1.zip)(missingMints, await getJupTokenPrices(missingMints.map((x) => new web3_js_1.PublicKey(x)))).reduce((acc, [key, value]) => {
-        acc[key.toString()] = value.realtimePrice;
-        return acc;
-    }, {});
-    return Object.values(getSortedPriceData({ ...prices, ...jupPrices }, mints)).map((x) => {
-        return { realtimePrice: x };
-    });
+    const jupPrices = await getJupTokenPrices(missingMints.map((x) => new web3_js_1.PublicKey(x)));
+    return { ...prices, ...jupPrices };
 }
 async function getJupTokenPrices(mints) {
     if (mints.length == 0) {
-        return [];
+        return {};
     }
     const data = getSortedPriceData(await (0, jupiterUtils_1.getJupPriceData)(mints), mints);
-    const prices = Object.values(data).map((x) => x !== null && typeof x === "object" && "price" in x
-        ? parseFloat(x.price)
-        : 0);
-    return prices.map((x) => {
-        return { realtimePrice: x };
-    });
+    const prices = Object.fromEntries(Object.entries(data).map(([mint, x]) => [
+        mint,
+        x !== null && typeof x === "object" && "price" in x
+            ? { realtimePrice: parseFloat(x.price) }
+            : { realtimePrice: 0 },
+    ]));
+    return prices;
 }
 function safeGetPrice(mint, priceType = generated_1.PriceType.Realtime) {
     if (mint && mint?.toString() in constants_1.PRICES) {

package/local/txSandbox.ts

@@ -1,16 +1,21 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  bytesToI80F48,
   ClientTransactionsManager,
   consoleLog,
+  fetchBank,
+  fetchMarginfiAccount,
   getBatches,
   getClient,
+  getLiqUtilzationRateBps,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  marginfiAccountEmpty,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -23,7 +28,7 @@ import {
 import { getSecretKey } from "./shared";
 
 const payForTransaction = false;
-const testProgram = false;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -47,23 +52,72 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    positionId: 2,
+    authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [rebalance(client)];
+  const supplyBank = await fetchBank(
+    umi,
+    publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
+  );
+  const debtBank = await fetchBank(
+    umi,
+    publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
+  );
+  const supplyWeight = bytesToI80F48(supplyBank.config.assetWeightInit.value);
+  const debtWeight = bytesToI80F48(debtBank.config.liabilityWeightInit.value);
 
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 5 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  console.log(
+    getLiqUtilzationRateBps(
+      34.36833665228071,
+      23.61750715267401,
+      client.pos.state.liqThresholdBps
+    ),
+    34.36833665228071 * supplyWeight,
+    23.61750715267401 * debtWeight
+  );
+  console.log(
+    getLiqUtilzationRateBps(
+      34.328721976,
+      23.575158311,
+      client.pos.state.liqThresholdBps
+    ),
+    34.328721976 * supplyWeight,
+    23.575158311 * debtWeight
+  );
+  console.log(client.pos.maxBoostToBps);
+
+  // const debtBank = await fetchBank(
+  //   umi,
+  //   publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
+  // );
+  // const supplyBank = await fetchBank(
+  //   umi,
+  //   publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
+  // );
+
+  // console.log(
+  //   bytesToI80F48(supplyBank.config.assetWeightInit.value),
+  //   bytesToI80F48(debtBank.config.liabilityWeightInit.value)
+  // );
+
+  // await client.pos.refreshPositionState();
+
+  // console.log(await client.pos.utilizationRateBpsDrift());
+
+  // const transactionItems = [rebalance(client)];
+
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 5 },
+  // });
+  // const statuses = await txManager.send(transactionItems);
+  // consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

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

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -4,7 +4,7 @@ import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { JupSwapManager, SwapParams, SwapInput } from "../swap";
 import { RebalanceValues } from "./rebalanceValues";
-import { RebalanceDirection, TokenType } from "../../generated";
+import { PriceType, RebalanceDirection, TokenType } from "../../generated";
 import {
   consoleLog,
   fromBaseUnit,
@@ -25,7 +25,8 @@ export class RebalanceSwapManager {
     private client: SolautoClient,
     private values: RebalanceValues,
     private flRequirements?: FlashLoanRequirements,
-    private targetLiqUtilizationRateBps?: number
+    private targetLiqUtilizationRateBps?: number,
+    private priceType?: PriceType
   ) {
     this.jupSwapManager = new JupSwapManager(client.signer);
   }
@@ -39,16 +40,16 @@ export class RebalanceSwapManager {
   }
 
   private postRebalanceLiqUtilizationRateBps(swapOutputAmount?: bigint) {
-    let supplyUsd = this.client.pos.supplyUsd();
+    let supplyUsd = this.client.pos.supplyUsd(this.priceType);
     // TODO: add token balance change
-    let debtUsd = this.client.pos.debtUsd();
+    let debtUsd = this.client.pos.debtUsd(this.priceType);
 
     const outputToken = this.isBoost()
       ? this.client.pos.supplyMint
       : this.client.pos.debtMint;
     const swapOutputUsd = swapOutputAmount
       ? fromBaseUnit(swapOutputAmount, tokenInfo(outputToken).decimals) *
-        (safeGetPrice(outputToken) ?? 0)
+        (safeGetPrice(outputToken, this.priceType) ?? 0)
       : this.usdToSwap();
 
     supplyUsd = this.isBoost()
@@ -110,7 +111,7 @@ export class RebalanceSwapManager {
       : this.client.pos.state.debt;
 
     let inputAmount = toBaseUnit(
-      this.usdToSwap() / safeGetPrice(input.mint)!,
+      this.usdToSwap() / safeGetPrice(input.mint, this.priceType)!,
       input.decimals
     );
 
@@ -139,7 +140,7 @@ export class RebalanceSwapManager {
           )
         )
       : toBaseUnit(
-          this.usdToSwap() / safeGetPrice(output.mint)!,
+          this.usdToSwap() / safeGetPrice(output.mint, this.priceType)!,
           output.decimals
         );
 

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -287,7 +287,8 @@ export class RebalanceTxBuilder {
       this.client,
       this.values,
       this.flRequirements,
-      this.targetLiqUtilizationRateBps
+      this.targetLiqUtilizationRateBps,
+      this.priceType
     );
     await this.swapManager.setSwapParams(attemptNum);
 

package/src/services/solauto/solautoClient.ts

@@ -179,6 +179,7 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     this.log("Position state: ", this.pos.state);
     this.log("Position settings: ", this.pos.settings);
+    this.log("Public key:", this.pos.publicKey.toString());
     this.log("Supply mint:", this.pos.supplyMint.toString());
     this.log("Debt mint:", this.pos.debtMint.toString());
     this.log("LP pool:", this.pos.lpPoolAccount.toString());

package/src/services/transactions/manager/clientTransactionsManager.ts

@@ -45,11 +45,11 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
 
     if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
       this.txHandler.log("Requires oracle update(s)...");
-      const txs = switchboardMints.map(
+      const oracleTxs = switchboardMints.map(
         (x) =>
           new TransactionItem(
             async () =>
-              buildSwbSubmitResponseTx(
+              await buildSwbSubmitResponseTx(
                 this.txHandler.connection,
                 this.txHandler.signer,
                 x
@@ -57,7 +57,7 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
             this.updateOracleTxName
           )
       );
-      txs.unshift(...txs);
+      txs.unshift(...oracleTxs);
     }
   }
 

package/src/services/transactions/manager/transactionsManager.ts

@@ -48,7 +48,7 @@ interface RetryConfig {
   retryDelay?: number;
 }
 
-export interface TransactionManagerArgs<T extends TxHandler> {
+export interface TransactionsManagerArgs<T extends TxHandler> {
   txHandler: T;
   statusCallback?: (statuses: TransactionManagerStatuses) => void;
   txRunType?: TransactionRunType;
@@ -73,7 +73,7 @@ export class TransactionsManager<T extends TxHandler> {
 
   updateOracleTxName = "update oracle";
 
-  constructor(args: TransactionManagerArgs<T>) {
+  constructor(args: TransactionsManagerArgs<T>) {
     this.txHandler = args.txHandler;
     this.statusCallback = args.statusCallback;
     this.txRunType = args.txRunType;
@@ -470,9 +470,9 @@ export class TransactionsManager<T extends TxHandler> {
       await itemSet.refetchAll(attemptNum, prevError);
     } else {
       await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
-      await Promise.all(
-        itemSets.map((itemSet) => itemSet.refetchAll(attemptNum, prevError))
-      );
+      for (const itemSet of itemSets) {
+        await itemSet.refetchAll(attemptNum, prevError);
+      }
     }
 
     const newItemSets = await this.assembleTransactionSets(

package/src/utils/generalUtils.ts

@@ -1,6 +1,11 @@
 import axios from "axios";
 import { PublicKey } from "@solana/web3.js";
-import { MaybeRpcAccount, publicKey, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
+import {
+  MaybeRpcAccount,
+  publicKey,
+  Umi,
+  PublicKey as UmiPublicKey,
+} from "@metaplex-foundation/umi";
 import { TOKEN_INFO, TokenInfo } from "../constants";
 
 export function buildHeliusApiUrl(heliusApiKey: string) {
@@ -199,4 +204,10 @@ export function u16ToArrayBufferLE(value: number): Uint8Array {
 
 export function validPubkey(pubkey?: PublicKey | UmiPublicKey | string) {
   return Boolean(pubkey) && pubkey!.toString() !== PublicKey.default.toString();
-}
+}
+
+export function createRecord<T>(keys: string[], values: T[]): Record<string, T> {
+  return Object.fromEntries(
+    zip(keys, values).map(([k, v]) => [k.toString(), v])
+  );
+}

package/src/utils/priceUtils.ts

@@ -9,9 +9,9 @@ import {
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import {
   consoleLog,
+  createRecord,
   currentUnixSeconds,
   retryWithExponentialBackoff,
-  zip,
 } from "./generalUtils";
 import { getJupPriceData } from "./jupiterUtils";
 import { PriceType } from "../generated";
@@ -26,64 +26,61 @@ export async function fetchTokenPrices(
   priceType: PriceType = PriceType.Realtime
 ): Promise<number[]> {
   const currentTime = currentUnixSeconds();
-  if (
-    !mints.some(
-      (mint) =>
-        !(mint.toString() in PRICES) ||
-        currentTime - PRICES[mint.toString()].time > 3
+  const mintStrs = mints.map((x) => x.toString());
+  const cachedPrices: Record<string, PriceResult> = Object.fromEntries(
+    Object.entries(PRICES).filter(
+      ([mint, price]) =>
+        mintStrs.includes(mint) && currentTime - price.time <= 3
     )
-  ) {
-    return mints.map((mint) => {
-      const priceData = PRICES[mint.toString()];
-      return priceType === PriceType.Ema
-        ? priceData.emaPrice
-        : priceData.realtimePrice;
-    });
-  }
+  );
 
-  const pythMints = mints.filter((x) => x.toString() in PYTH_PRICE_FEED_IDS);
-  const switchboardMints = mints.filter(
+  const newMints = mintStrs
+    .filter((x) => !Object.keys(cachedPrices).includes(x))
+    .map((x) => new PublicKey(x));
+  const pythMints = newMints.filter((x) => x.toString() in PYTH_PRICE_FEED_IDS);
+  const switchboardMints = newMints.filter(
     (x) => x.toString() in Object.keys(SWITCHBOARD_PRICE_FEED_IDS)
   );
-  const otherMints = mints.filter(
+  const otherMints = newMints.filter(
     (x) => !pythMints.includes(x) && !switchboardMints.includes(x)
   );
+  const newPrices: Record<string, PriceResult> = Object.assign(
+    {},
+    ...(await Promise.all([
+      getPythPrices(pythMints),
+      getSwitchboardPrices(switchboardMints),
+      getJupTokenPrices(otherMints),
+    ]))
+  );
 
-  const [pythData, switchboardData, jupData] = await Promise.all([
-    zip(pythMints, await getPythPrices(pythMints, priceType)),
-    zip(switchboardMints, await getSwitchboardPrices(switchboardMints)),
-    zip(otherMints, await getJupTokenPrices(otherMints)),
-  ]);
-
-  const prices = mints.map((mint) => {
-    const item = [...pythData, ...switchboardData, ...jupData].find((data) =>
-      data[0].equals(mint)
-    );
-    return item ? item[1] : { realtimePrice: 0 };
-  });
-
-  for (var i = 0; i < mints.length; i++) {
-    const realtimePrice = prices[i].realtimePrice;
-    PRICES[mints[i].toString()] = {
+  for (const mint of newMints) {
+    const realtimePrice = newPrices[mint.toString()].realtimePrice;
+    PRICES[mint.toString()] = {
       realtimePrice,
-      emaPrice: prices[i].emaPrice ?? realtimePrice,
+      emaPrice: newPrices[mint.toString()].emaPrice ?? realtimePrice,
       time: currentUnixSeconds(),
     };
   }
 
-  return prices.map((x) =>
-    priceType === PriceType.Ema
-      ? (x.emaPrice ?? x.realtimePrice)
-      : x.realtimePrice
-  );
+  const prices: Record<string, PriceResult> = {
+    ...PRICES,
+    ...newPrices,
+  };
+
+  return mints.map((x) => {
+    const priceResult = prices[x.toString()];
+    const realtimePrice = priceResult.realtimePrice;
+    return priceType === PriceType.Ema
+      ? (priceResult.emaPrice ?? realtimePrice)
+      : realtimePrice;
+  });
 }
 
 export async function getPythPrices(
-  mints: PublicKey[],
-  priceType: PriceType
-): Promise<PriceResult[]> {
+  mints: PublicKey[]
+): Promise<Record<string, PriceResult>> {
   if (mints.length === 0) {
-    return [];
+    return {};
   }
 
   const priceFeedIds = mints.map(
@@ -127,7 +124,10 @@ export async function getPythPrices(
     200
   );
 
-  return prices;
+  return createRecord(
+    mints.map((x) => x.toString()),
+    prices
+  );
 }
 
 function getSortedPriceData(
@@ -148,15 +148,15 @@ function getSortedPriceData(
 
 export async function getSwitchboardPrices(
   mints: PublicKey[]
-): Promise<PriceResult[]> {
+): Promise<Record<string, PriceResult>> {
   if (mints.length === 0) {
-    return [];
+    return {};
   }
 
   const { CrossbarClient } = SwbCommon;
   const crossbar = CrossbarClient.default();
 
-  let prices: Record<string, number> = {};
+  let prices: Record<string, PriceResult> = {};
   try {
     prices = await retryWithExponentialBackoff(
       async () => {
@@ -172,11 +172,11 @@ export async function getSwitchboardPrices(
           throw new Error("Unable to fetch Switchboard prices");
         }
 
-        const finalMap: Record<string, number> = {};
+        const finalMap: Record<string, PriceResult> = {};
         for (const item of resp) {
           for (const [k, v] of Object.entries(SWITCHBOARD_PRICE_FEED_IDS)) {
             if (item.feedHash === v.feedHash) {
-              finalMap[k] = Number(item.results[0]);
+              finalMap[k] = { realtimePrice: Number(item.results[0]) };
             }
           }
         }
@@ -190,42 +190,32 @@ export async function getSwitchboardPrices(
   }
 
   const missingMints = mints.filter((x) => !prices[x.toString()]);
-  const jupPrices = zip(
-    missingMints,
-    await getJupTokenPrices(missingMints.map((x) => new PublicKey(x)))
-  ).reduce(
-    (acc, [key, value]) => {
-      acc[key.toString()] = value.realtimePrice;
-      return acc;
-    },
-    {} as Record<string, number>
+  const jupPrices = await getJupTokenPrices(
+    missingMints.map((x) => new PublicKey(x))
   );
 
-  return Object.values(
-    getSortedPriceData({ ...prices, ...jupPrices }, mints)
-  ).map((x) => {
-    return { realtimePrice: x };
-  });
+  return { ...prices, ...jupPrices };
 }
 
 export async function getJupTokenPrices(
   mints: PublicKey[]
-): Promise<PriceResult[]> {
+): Promise<Record<string, PriceResult>> {
   if (mints.length == 0) {
-    return [];
+    return {};
   }
 
   const data = getSortedPriceData(await getJupPriceData(mints), mints);
 
-  const prices = Object.values(data).map((x) =>
-    x !== null && typeof x === "object" && "price" in x
-      ? parseFloat(x.price as string)
-      : 0
+  const prices: Record<string, PriceResult> = Object.fromEntries(
+    Object.entries(data).map(([mint, x]) => [
+      mint,
+      x !== null && typeof x === "object" && "price" in x
+        ? { realtimePrice: parseFloat(x.price as string) }
+        : { realtimePrice: 0 },
+    ])
   );
 
-  return prices.map((x) => {
-    return { realtimePrice: x };
-  });
+  return prices;
 }
 
 export function safeGetPrice(

package/src/utils/switchboardUtils.ts

@@ -53,12 +53,17 @@ export async function buildSwbSubmitResponseTx(
 ): Promise<TransactionItemInputs | undefined> {
   const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
   const [pullIx, responses] = await retryWithExponentialBackoff(
-    async () =>
-      await feed.fetchUpdateIx({
+    async () => {
+      const res = await feed.fetchUpdateIx({
         chain: "solana",
         network: "mainnet-beta",
-      }),
-    2,
+      });
+      if (!res[1] || !res[1][0].value) {
+        throw new Error("Unable to fetch Switchboard pull IX");
+      }
+      return res;
+    },
+    3,
     200
   );
 
@@ -111,4 +116,4 @@ export async function getSwitchboardFeedData(
 
 export function isSwitchboardMint(mint: PublicKey | string) {
   return Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
-}
+}