@haven-fi/solauto-sdk 1.0.299 → 1.0.301

package/dist/utils/generalUtils.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 export declare function consoleLog(...args: any[]): void;
 export declare function generateRandomU8(): number;
@@ -7,7 +7,10 @@ export declare function currentUnixSeconds(): number;
 export declare function getSolanaAccountCreated(umi: Umi, pk: PublicKey): Promise<boolean>;
 export declare function rpcAccountCreated(account: MaybeRpcAccount): boolean;
 export declare function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean;
-export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
+export declare function zip<T, U>(list1: T[], list2: U[]): [T, U][];
+export declare function fetchTokenPrices(conn: Connection, mints: PublicKey[]): Promise<number[]>;
+export declare function getPythPrices(mints: PublicKey[]): Promise<number[]>;
+export declare function getSwitchboardPrices(conn: Connection, mints: PublicKey[]): Promise<number[]>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number, prevErr?: Error) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;

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,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AACD,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,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAsD5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAalC,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AACD,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,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAqCnB;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAoCrD;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,qBA8BnB;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;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"}

package/dist/utils/generalUtils.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLog = consoleLog;
 exports.generateRandomU8 = generateRandomU8;
@@ -7,13 +10,21 @@ exports.currentUnixSeconds = currentUnixSeconds;
 exports.getSolanaAccountCreated = getSolanaAccountCreated;
 exports.rpcAccountCreated = rpcAccountCreated;
 exports.arraysAreEqual = arraysAreEqual;
+exports.zip = zip;
 exports.fetchTokenPrices = fetchTokenPrices;
+exports.getPythPrices = getPythPrices;
+exports.getSwitchboardPrices = getSwitchboardPrices;
 exports.safeGetPrice = safeGetPrice;
 exports.retryWithExponentialBackoff = retryWithExponentialBackoff;
+const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const pythConstants_1 = require("../constants/pythConstants");
 const numberUtils_1 = require("./numberUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
+const on_demand_1 = require("@switchboard-xyz/on-demand");
+const anchor_1 = require("@coral-xyz/anchor");
+const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
+const switchboardConstants_1 = require("../constants/switchboardConstants");
 function consoleLog(...args) {
     if (globalThis.LOCAL_TEST) {
         console.log(...args);
@@ -53,12 +64,39 @@ function arraysAreEqual(arrayA, arrayB) {
     }
     return true;
 }
-async function fetchTokenPrices(mints) {
+function zip(list1, list2) {
+    const minLength = Math.min(list1.length, list2.length);
+    const result = [];
+    for (let i = 0; i < minLength; i++) {
+        result.push([list1[i], list2[i]]);
+    }
+    return result;
+}
+async function fetchTokenPrices(conn, mints) {
     const currentTime = 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([
+        zip(pythMints, await getPythPrices(pythMints)),
+        zip(switchboardMints, await getSwitchboardPrices(conn, 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: currentUnixSeconds(),
+        };
+    }
+    return prices;
+}
+async function getPythPrices(mints) {
     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 retryWithExponentialBackoff(async () => {
@@ -81,14 +119,23 @@ async function fetchTokenPrices(mints) {
         });
         return prices;
     }, 5, 200);
-    for (var i = 0; i < mints.length; i++) {
-        solautoConstants_1.PRICES[mints[i].toString()] = {
-            price: prices[i],
-            time: currentUnixSeconds(),
-        };
-    }
     return prices;
 }
+async function getSwitchboardPrices(conn, mints) {
+    const dummyWallet = {
+        publicKey: 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 results = await Promise.all(mints.map(async (mint) => {
+        const feed = new on_demand_1.PullFeed(program, new web3_js_1.PublicKey(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()]));
+        const result = await feed.loadData();
+        return Number(result.result.value) / Math.pow(10, 18);
+    }));
+    return results;
+}
 function safeGetPrice(mint) {
     if (mint && mint?.toString() in solautoConstants_1.PRICES) {
         return solautoConstants_1.PRICES[mint.toString()].price;

package/dist/utils/marginfiUtils.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
@@ -9,14 +9,14 @@ interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
 }
 export declare function findMarginfiAccounts(bank: PublicKey): AllMarginfiAssetAccounts;
 export declare function calcMaxLtvAndLiqThreshold(supplyBank: Bank, debtBank: Bank, supplyPrice: number): [number, number];
-export declare function getMaxLtvAndLiqThreshold(umi: Umi, marginfiGroup: PublicKey, supply: {
+export declare function getMaxLtvAndLiqThreshold(conn: Connection, umi: Umi, marginfiGroup: PublicKey, supply: {
     mint: PublicKey;
     bank?: Bank | null;
 }, debt: {
     mint: PublicKey;
     bank?: Bank | null;
 }, supplyPrice?: number): Promise<[number, number]>;
-export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
+export declare function getAllMarginfiAccountsByAuthority(conn: Connection, umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
     marginfiAccount: PublicKey;
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
@@ -30,7 +30,7 @@ type BanksCache = {
         [mint: string]: Bank;
     };
 };
-export declare function getMarginfiAccountPositionState(umi: Umi, protocolAccount: {
+export declare function getMarginfiAccountPositionState(conn: Connection, umi: Umi, protocolAccount: {
     pk: PublicKey;
     data?: MarginfiAccount;
 }, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;

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,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,wBAAwB,CAY9E;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,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,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CAwDA;AA6DD,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,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,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,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CAuDA;AAgED,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,IAAI,EAAE,UAAU,EAChB,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,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}

package/dist/utils/marginfiUtils.js

@@ -42,7 +42,7 @@ function calcMaxLtvAndLiqThreshold(supplyBank, debtBank, supplyPrice) {
     }
     return [maxLtv, liqThreshold];
 }
-async function getMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt, supplyPrice) {
+async function getMaxLtvAndLiqThreshold(conn, umi, marginfiGroup, supply, debt, supplyPrice) {
     if (!supply.bank && supply.mint.equals(web3_js_1.PublicKey.default)) {
         return [0, 0];
     }
@@ -54,7 +54,7 @@ async function getMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt, supply
         debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank), { commitment: "confirmed" });
     }
     if (!supplyPrice) {
-        const [price] = await (0, generalUtils_1.fetchTokenPrices)([
+        const [price] = await (0, generalUtils_1.fetchTokenPrices)(conn, [
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supply.bank.mint),
         ]);
         supplyPrice = price;
@@ -64,7 +64,7 @@ async function getMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt, supply
     }
     return calcMaxLtvAndLiqThreshold(supply.bank, debt.bank, supplyPrice);
 }
-async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithSolauto) {
+async function getAllMarginfiAccountsByAuthority(conn, umi, authority, compatibleWithSolauto) {
     const marginfiAccounts = await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {
         commitment: "confirmed",
         dataSlice: {
@@ -86,7 +86,9 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
     if (compatibleWithSolauto) {
         const positionStates = await Promise.all(marginfiAccounts.map(async (x) => ({
             publicKey: x.publicKey,
-            state: await getMarginfiAccountPositionState(umi, { pk: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey) }),
+            state: await getMarginfiAccountPositionState(conn, umi, {
+                pk: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
+            }),
         })));
         return positionStates
             .sort((a, b) => (0, numberUtils_1.fromBaseUnit)(b.state?.netWorth.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS) -
@@ -104,12 +106,14 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
         }));
     }
 }
-async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
+async function getTokenUsage(conn, bank, isAsset, shares, amountUsedAdjustment) {
     let amountUsed = 0;
     let amountCanBeUsed = 0;
     let marketPrice = 0;
     if (bank !== null) {
-        [marketPrice] = await (0, generalUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
+        [marketPrice] = await (0, generalUtils_1.fetchTokenPrices)(conn, [
+            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint),
+        ]);
         const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(bank);
         const shareValue = isAsset ? assetShareValue : liabilityShareValue;
         amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
@@ -143,7 +147,7 @@ async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
         padding: new Uint8Array([]),
     };
 }
-async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGroup, supply, debt, livePositionUpdates) {
+async function getMarginfiAccountPositionState(conn, umi, protocolAccount, marginfiGroup, supply, debt, livePositionUpdates) {
     let marginfiAccount = protocolAccount.data ??
         (await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(protocolAccount.pk), {
             commitment: "confirmed",
@@ -186,7 +190,7 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
             if (!supply.mint) {
                 supply.mint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint);
             }
-            supplyUsage = await getTokenUsage(supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), livePositionUpdates?.supplyAdjustment);
+            supplyUsage = await getTokenUsage(conn, supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), livePositionUpdates?.supplyAdjustment);
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
@@ -197,7 +201,7 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
             if (!debt.mint) {
                 debt.mint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(debtBank.mint);
             }
-            debtUsage = await getTokenUsage(debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), livePositionUpdates?.debtAdjustment);
+            debtUsage = await getTokenUsage(conn, debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), livePositionUpdates?.debtAdjustment);
         }
     }
     if (supplyBank === null) {
@@ -208,17 +212,17 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
         return undefined;
     }
     if (!supplyUsage) {
-        supplyUsage = await getTokenUsage(supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
+        supplyUsage = await getTokenUsage(conn, supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
     }
     if (constants_1.TOKEN_INFO[supplyBank.mint.toString()].isStableCoin &&
         (debtBank === null || constants_1.TOKEN_INFO[debtBank.mint.toString()].isStableCoin)) {
         return undefined;
     }
     if (!debtUsage) {
-        debtUsage = await getTokenUsage(debtBank, false, 0, livePositionUpdates?.debtAdjustment);
+        debtUsage = await getTokenUsage(conn, debtBank, false, 0, livePositionUpdates?.debtAdjustment);
     }
     const supplyPrice = (0, generalUtils_1.safeGetPrice)(supply.mint);
-    let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(umi, marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP), {
+    let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(conn, umi, marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP), {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
         bank: supplyBank,
     }, {

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

@@ -1,4 +1,4 @@
-import { PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { Program, Umi } from "@metaplex-foundation/umi";
 import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
@@ -12,8 +12,8 @@ export declare function eligibleForRefresh(positionState: PositionState, positio
 export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;
 export declare function getAllReferralStates(umi: Umi): Promise<PublicKey[]>;
 export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<PublicKey[]>;
-export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;
-export declare function positionStateWithLatestPrices(state: PositionState, supplyPrice?: number, debtPrice?: number): Promise<PositionState>;
+export declare function getAllPositionsByAuthority(conn: Connection, umi: Umi, user: PublicKey, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;
+export declare function positionStateWithLatestPrices(conn: Connection, state: PositionState, supplyPrice?: number, debtPrice?: number): Promise<PositionState>;
 interface AssetProps {
     mint: PublicKey;
     price?: number;

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":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAGL,OAAO,EAEP,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAElB,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,gCAAgC,EAChC,SAAS,EAMV,MAAM,iBAAiB,CAAC;AAkBzB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAczE;AAgBD,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,eAAe,EAAE,MAAM,GACtB,yBAAyB,CAgB3B;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAAG,SAAS,EACvD,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,EACvB,oBAAoB,SAAI,GACvB,eAAe,GAAG,SAAS,CA2C7B;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,eAAe,EAAE,MAAM,GACtB,OAAO,CAYT;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,EACrB,kBAAkB,CAAC,EAAE,YAAY,GAChC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAuFnC;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBzE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA+BtB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,EACf,kBAAkB,CAAC,EAAE,YAAY,GAChC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6CnC;AAED,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,aAAa,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,CAAC,CA2CxB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CA8Df;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CA8B3B;AAED,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEhD,qBAAa,mBAAmB;IACvB,gBAAgB,SAAa;IAC7B,cAAc,SAAa;IAC3B,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAC/C,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE,CAAa;IACpE,aAAa,EAAE,SAAS,GAAG,SAAS,CAAa;IAExD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IA6B9B,KAAK;IASL,UAAU,IAAI,OAAO;CAStB"}

package/dist/utils/solauto/generalUtils.js

@@ -225,7 +225,7 @@ async function getReferralsByUser(umi, user) {
     });
     return accounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
 }
-async function getAllPositionsByAuthority(umi, user, positionTypeFilter) {
+async function getAllPositionsByAuthority(conn, umi, user, positionTypeFilter) {
     const solautoCompatiblePositions = await Promise.all([
         (async () => {
             const solautoManagedPositions = await getSolautoManagedPositions(umi, user, positionTypeFilter);
@@ -238,7 +238,7 @@ async function getAllPositionsByAuthority(umi, user, positionTypeFilter) {
             if (positionTypeFilter === generated_1.PositionType.SafeLoan) {
                 return [];
             }
-            let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
+            let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(conn, umi, user, true);
             marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
                 (x.debtMint.equals(web3_js_1.PublicKey.default) ||
                     constants_1.ALL_SUPPORTED_TOKENS.includes(x.debtMint.toString())));
@@ -256,9 +256,9 @@ async function getAllPositionsByAuthority(umi, user, positionTypeFilter) {
     ]);
     return solautoCompatiblePositions.flat();
 }
-async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
+async function positionStateWithLatestPrices(conn, state, supplyPrice, debtPrice) {
     if (!supplyPrice || !debtPrice) {
-        [supplyPrice, debtPrice] = await (0, generalUtils_1.fetchTokenPrices)([
+        [supplyPrice, debtPrice] = await (0, generalUtils_1.fetchTokenPrices)(conn, [
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint),
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint),
         ]);

package/local/createFeeAccounts.ts

@@ -0,0 +1,52 @@
+import { PublicKey } from "@solana/web3.js";
+import { ALL_SUPPORTED_TOKENS, SOLAUTO_FEES_WALLET } from "../src/constants";
+import {
+  buildHeliusApiUrl,
+  createAssociatedTokenAccountUmiIx,
+  getSolanaRpcConnection,
+  getTokenAccount,
+  sendSingleOptimizedTransaction,
+  zip,
+} from "../src/utils";
+import { getSecretKey } from "./shared";
+import {
+  createSignerFromKeypair,
+  publicKey,
+  signerIdentity,
+  transactionBuilder,
+} from "@metaplex-foundation/umi";
+
+async function create() {
+  let [connection, umi] = getSolanaRpcConnection(
+    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+  );
+
+  const secretKey = getSecretKey("solauto-auth");
+  const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
+  const signer = createSignerFromKeypair(umi, signerKeypair);
+
+  umi = umi.use(signerIdentity(signer));
+
+  const tokenAccounts = await umi.rpc.getAccounts(
+    ALL_SUPPORTED_TOKENS.map((x) =>
+      publicKey(getTokenAccount(SOLAUTO_FEES_WALLET, new PublicKey(x)))
+    )
+  );
+
+  for (const accounts of zip(tokenAccounts, ALL_SUPPORTED_TOKENS)) {
+    if (!accounts[0].exists) {
+      const tx = createAssociatedTokenAccountUmiIx(
+        signer,
+        SOLAUTO_FEES_WALLET,
+        new PublicKey(accounts[1])
+      );
+      await sendSingleOptimizedTransaction(
+        umi,
+        connection,
+        transactionBuilder().add(tx)
+      );
+    }
+  }
+}
+
+create();

package/local/shared.ts

@@ -21,7 +21,7 @@ export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
   );
 }
 
-const keypair = Keypair.fromSecretKey(getSecretKey());
+const keypair = Keypair.fromSecretKey(getSecretKey("solauto-auth"));
 const [connection, _] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY ?? ""));
 
 async function createAndSendV0Tx(txInstructions: TransactionInstruction[]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.299",
+  "version": "1.0.301",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -12,9 +12,11 @@
     "test:unit": "ts-mocha -p ./tsconfig.json -t 1000000 tests/unit/**/*.ts",
     "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"
+    "update-lut:marginfi": "npx ts-node local/updateMarginfiLUT.ts",
+    "create-fee-accounts": "npx ts-node local/createFeeAccounts.ts"
   },
   "dependencies": {
+    "@coral-xyz/anchor": "^0.30.1",
     "@jup-ag/api": "^6.0.24",
     "@metaplex-foundation/umi": "^0.9.1",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.1",
@@ -22,6 +24,7 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.95.4",
+    "@switchboard-xyz/on-demand": "^1.2.51",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
     "rpc-websockets": "7.11.0"

package/src/clients/solautoMarginfiClient.ts

@@ -159,6 +159,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   async setIntermediaryMarginfiDetails() {
     const existingMarginfiAccounts = (
       await getAllMarginfiAccountsByAuthority(
+        this.connection,
         this.umi,
         toWeb3JsPublicKey(this.signer.publicKey),
         false
@@ -227,6 +228,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       return [0, 0];
     } else {
       const [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
+        this.connection,
         this.umi,
         this.marginfiGroup,
         {
@@ -676,6 +678,7 @@ 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/marginfiAccounts.ts

@@ -2,12 +2,15 @@ import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PublicKey } from "@solana/web3.js";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "./switchboardConstants";
 
 export const DEFAULT_MARGINFI_GROUP =
   "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
 export const DEFAULT_PUBKEY = PublicKey.default.toString();
 
+const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
+
 export const MARGINFI_ACCOUNTS: {
   [group: string]: { [token: string]: MarginfiAssetAccounts };
 } = {
@@ -48,24 +51,24 @@ export const MARGINFI_ACCOUNTS: {
       vaultAuthority: "AEZb1XH5bfLwqk3hBKDuLfWyJKdLTgDPCkgn64BJKcvV",
       priceOracle: "DCNeMcAZGU7pAsqu5q2xMKerq35BnUuTkagt1dkR1xB",
     },
+    [tokens.H_SOL]: {
+      bank: "GJCi1uj3kYPZ64puA5sLUiCQfFapxT2xnREzrbDzFkYY",
+      liquidityVault: "8M97jkdr4rJtPnQ4yQ9stD6qVwaUvjrBdDPDbHJnPJLf",
+      vaultAuthority: "8x7mgTn5RvHR8Tn3CJqexSuQwrs6MLEy8csuXCDVvvpt",
+      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.H_SOL.toString()],
+    },
+    [tokens.JUP_SOL]: {
+      bank: "8LaUZadNqtzuCG7iCvZd7d5cbquuYfv19KjAg6GPuuCb",
+      liquidityVault: "B1zjqKPoYp9bTMhzFADaAvjyGb49FMitLpi6P3Pa3YR6",
+      vaultAuthority: "93Qqsge2jHVsWLd8vas4cWghrsZJooMUr5JKN5DtcfMX",
+      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.JUP_SOL.toString()],
+    },
     [tokens.JUP]: {
       bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
       liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
       vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
       priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
     },
-    [tokens.BONK]: {
-      bank: "DeyH7QxWvnbbaVB4zFrf4hoq7Q8z1ZT14co42BGwGtfM",
-      liquidityVault: "7FdQsXmCW3N5JQbknj3F9Yqq73er9VZJjGhEEMS8Ct2A",
-      vaultAuthority: "26kcZkdjJc94PdhqiLiEaGiLCYgAVVUfpDaZyK4cqih3",
-      priceOracle: "DBE3N8uNjhKPRHfANdwGvCZghWXyLPdqdSbEW2XFwBiX",
-    },
-    [tokens.WIF]: {
-      bank: "9dpu8KL5ABYiD3WP2Cnajzg1XaotcJvZspv29Y1Y3tn1",
-      liquidityVault: "4kT3EXc5dDVndUU9mV6EH3Jh3CSEvpcCZjuMkwqrtxUy",
-      vaultAuthority: "9gNrvvZ9RuTyRWooiEEypwcXU6kyXW8yWuhXU8tWUH5L",
-      priceOracle: "6B23K3tkb51vLZA14jcEQVCA1pfHptzEHFA93V5dYwbT",
-    },
     [tokens.JTO]: {
       bank: "EdB7YADw4XUt6wErT8kHGCUok4mnTpWGzPUU9rWDebzb",
       liquidityVault: "3bY1DEkXodGmPMG5f7ABA12228MBG5JdAAKf5cgkB6G1",
@@ -106,7 +109,7 @@ export const MARGINFI_ACCOUNTS: {
       bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
       liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
       vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
-      priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX",
+      priceOracle: USDC_PRICE_ORACLE,
     },
     [tokens.USDT]: {
       bank: "HmpMfL8942u22htC4EMiWgLX931g3sacXFR6KjuLgKLV",
@@ -114,6 +117,60 @@ export const MARGINFI_ACCOUNTS: {
       vaultAuthority: "9r6z6KgkEytHCdQWNxvDQH98PsfU98f1m5PCg47mY2XE",
       priceOracle: "HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM",
     },
+    [tokens.BONK]: {
+      bank: "DeyH7QxWvnbbaVB4zFrf4hoq7Q8z1ZT14co42BGwGtfM",
+      liquidityVault: "7FdQsXmCW3N5JQbknj3F9Yqq73er9VZJjGhEEMS8Ct2A",
+      vaultAuthority: "26kcZkdjJc94PdhqiLiEaGiLCYgAVVUfpDaZyK4cqih3",
+      priceOracle: "DBE3N8uNjhKPRHfANdwGvCZghWXyLPdqdSbEW2XFwBiX",
+    },
+    [tokens.WIF]: {
+      bank: "9dpu8KL5ABYiD3WP2Cnajzg1XaotcJvZspv29Y1Y3tn1",
+      liquidityVault: "4kT3EXc5dDVndUU9mV6EH3Jh3CSEvpcCZjuMkwqrtxUy",
+      vaultAuthority: "9gNrvvZ9RuTyRWooiEEypwcXU6kyXW8yWuhXU8tWUH5L",
+      priceOracle: "6B23K3tkb51vLZA14jcEQVCA1pfHptzEHFA93V5dYwbT",
+    },
+  },
+  ["DQ2jqDJw9uzTwttf6h6r217BQ7kws3jZbJXDkfbCJa1q"]: {
+    [tokens.POPCAT]: {
+      bank: "845oEvt1oduoBj5zQxTr21cWWaUVnRjGerJuW3yMo2nn",
+      liquidityVault: "At6R64ip51zay4dT6k1WnVGETSMcaiY5vggD5DVTgxri",
+      vaultAuthority: "dNraDCWb5usDSoW4kD1Mi2E9WsNu6EABcQZqnrDfjNb",
+      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.POPCAT.toString()],
+    },
+    [tokens.USDC]: {
+      bank: "EXrnNVfLagt3j4hCHSD9WqK75o6dkZBtjpnrSrSC78MA",
+      liquidityVault: "D9HSUYz3Rg2cTH65dUPaQS1MYxofNTeLecsAjiBgVPur",
+      vaultAuthority: "5ivKgJnxQ9CewJcKYSPQUiQFdfJki6YS87FqohnMSsFM",
+      priceOracle: USDC_PRICE_ORACLE,
+    },
+  },
+  ["EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"]: {
+    [tokens.RETARDIO]: {
+      bank: "3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM",
+      liquidityVault: "863K9YPVT3xbUGFZevrQJLqMux3UdRkwNQ6usAp4hJyy",
+      vaultAuthority: "Qsv2rnNRdv59AwRU3YmGPMCTdKT41CDAKyYAr4srCJR",
+      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.RETARDIO.toString()],
+    },
+    [tokens.USDC]: {
+      bank: "6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5",
+      liquidityVault: "7orVfNL5ZjqvdSaDgYLgBk4i5B3AnwFXNqqAvJbx6DFy",
+      vaultAuthority: "G4Azxk4PYtNRmDZkJppYo3rNAinkZXzYpQPG5dVDh4Nj",
+      priceOracle: USDC_PRICE_ORACLE,
+    },
+  },
+  ["G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"]: {
+    [tokens.BILLY]: {
+      bank: "Dj3PndQ3j1vuga5ApiFWWAfQ4h3wBtgS2SeLZBT2LD4g",
+      liquidityVault: "BRcRMDVPBQzXNXWtSS6bNotcGxhVsxfiAt1qf8nFVUpx",
+      vaultAuthority: "36SgFh1qBRyj1PEhsn7Kg9Sfwbrn7rHP7kvTM5o5n6AL",
+      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.BILLY.toString()],
+    },
+    [tokens.USDC]: {
+      bank: "A7vBgCowCYeja7GTc3pyqUBdC9Gkue2gWaMjGZW38meM",
+      liquidityVault: "DBGhZ8TJTG2Pacdva27zY9etaro24o1tTA3LToSjYHbx",
+      vaultAuthority: "Cg6BCqkGny7A2AXCV8rikhHXM82wqqfzmdsTobEeTQkH",
+      priceOracle: USDC_PRICE_ORACLE,
+    },
   },
 };
 

package/src/constants/pythConstants.ts

@@ -17,10 +17,6 @@ export const PYTH_PRICE_FEED_IDS = {
     "0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f",
   [tokens.JUP]:
     "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
-  [tokens.BONK]:
-    "0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419",
-  [tokens.WIF]:
-    "0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc",
   [tokens.JTO]:
     "0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2",
   [tokens.JLP]:
@@ -37,4 +33,8 @@ export const PYTH_PRICE_FEED_IDS = {
     "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
   [tokens.USDT]:
     "0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
+  [tokens.BONK]:
+    "0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419",
+  [tokens.WIF]:
+    "0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc",
 };

package/src/constants/switchboardConstants.ts

@@ -0,0 +1,10 @@
+import * as tokens from "./tokenConstants";
+
+// https://beta.ondemand.switchboard.xyz/solana/mainnet
+export const SWITCHBOARD_PRICE_FEED_IDS: { [key: string]: string } = {
+  [tokens.JUP_SOL]: "HX5WM3qzogAfRCjBUWwnniLByMfFrjm1b5yo4KoWGR27",
+  [tokens.H_SOL]: "1snBjCaHejZqQsAqkELAKNaqUrDNNCr7zmNX6qaQCzg",
+  [tokens.POPCAT]: "FTcFqwCjAgv2VMaowQ9XSBcesVzFzZkaju25nKio6bki",
+  [tokens.RETARDIO]: "EvPXnpMoyrj4B6P55LDP2VpSLkTBWom2SqL4486ToNhM",
+  [tokens.BILLY]: "uBe4er4VSMgYvBNwSbFctSShRXNPkCfaPh7zHMBFeBi",
+};