@haven-fi/solauto-sdk 1.0.626 → 1.0.628

package/dist/utils/generalUtils.d.ts

@@ -19,4 +19,5 @@ 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>;
 export declare function toEnumValue<E extends object>(enumObj: E, value: number): E[keyof E] | undefined;
 export declare function customRpcCall(umi: Umi, method: string, params?: any): Promise<any>;
+export declare function u16ToArrayBufferLE(value: number): Uint8Array;
 //# 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,MAAM,0BAA0B,CAAC;AAC3E,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"}
+{"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,MAAM,0BAA0B,CAAC;AAC3E,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"}

package/dist/utils/generalUtils.js

@@ -20,6 +20,7 @@ exports.zip = zip;
 exports.retryWithExponentialBackoff = retryWithExponentialBackoff;
 exports.toEnumValue = toEnumValue;
 exports.customRpcCall = customRpcCall;
+exports.u16ToArrayBufferLE = u16ToArrayBufferLE;
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
@@ -159,3 +160,12 @@ async function customRpcCall(umi, method, params) {
         return data;
     }
 }
+function u16ToArrayBufferLE(value) {
+    // Create a buffer of 2 bytes
+    const buffer = new ArrayBuffer(2);
+    const dataView = new DataView(buffer);
+    // Set the Uint16 value in little-endian order
+    dataView.setUint16(0, value, true);
+    // Return the buffer
+    return new Uint8Array(buffer);
+}

package/dist/utils/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./accountUtils";
 export * from "./generalUtils";
+export * from "./instructionUtils";
 export * from "./jitoUtils";
 export * from "./jupiterUtils";
 export * from "./marginfiUtils";
@@ -8,5 +9,6 @@ export * from "./solautoUtils";
 export * from "./solanaUtils";
 export * from "./stringUtils";
 export * from "./priceUtils";
+export * from "./pythUtils";
 export * from "./switchboardUtils";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC"}

package/dist/utils/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./accountUtils"), exports);
 __exportStar(require("./generalUtils"), exports);
+__exportStar(require("./instructionUtils"), exports);
 __exportStar(require("./jitoUtils"), exports);
 __exportStar(require("./jupiterUtils"), exports);
 __exportStar(require("./marginfiUtils"), exports);
@@ -24,4 +25,5 @@ __exportStar(require("./solautoUtils"), exports);
 __exportStar(require("./solanaUtils"), exports);
 __exportStar(require("./stringUtils"), exports);
 __exportStar(require("./priceUtils"), exports);
+__exportStar(require("./pythUtils"), exports);
 __exportStar(require("./switchboardUtils"), exports);

package/dist/utils/instructionUtils.d.ts

@@ -0,0 +1,15 @@
+import { OptionOrNullable } from "@metaplex-foundation/umi";
+import { DCASettingsInpArgs, SolautoSettingsParametersInpArgs } from "../generated";
+import { SolautoClient, TransactionItem } from "../services";
+import { PublicKey } from "@solana/web3.js";
+export declare function openSolautoPosition(client: SolautoClient, settingParams: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionItem;
+export declare function closeSolautoPosition(client: SolautoClient): TransactionItem;
+export declare function updateSolautoPosition(client: SolautoClient, settings: OptionOrNullable<SolautoSettingsParametersInpArgs>, dca: OptionOrNullable<DCASettingsInpArgs>): TransactionItem;
+export declare function cancelSolautoDca(client: SolautoClient): TransactionItem;
+export declare function deposit(client: SolautoClient, baseUnitAmount: bigint): TransactionItem;
+export declare function borrow(client: SolautoClient, baseUnitAmount: bigint): TransactionItem;
+export declare function withdraw(client: SolautoClient, amount: "All" | bigint): TransactionItem;
+export declare function repay(client: SolautoClient, amount: "All" | bigint): TransactionItem;
+export declare function rebalance(client: SolautoClient, targetLiqUtilizationRateBps?: number): TransactionItem;
+export declare function swapThenDeposit(client: SolautoClient, depositMint: PublicKey, depositAmountBaseUnit: bigint): TransactionItem[];
+//# sourceMappingURL=instructionUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,mBAQzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAcrE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,mBAUrC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBA2C9B"}

package/dist/utils/instructionUtils.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openSolautoPosition = openSolautoPosition;
+exports.closeSolautoPosition = closeSolautoPosition;
+exports.updateSolautoPosition = updateSolautoPosition;
+exports.cancelSolautoDca = cancelSolautoDca;
+exports.deposit = deposit;
+exports.borrow = borrow;
+exports.withdraw = withdraw;
+exports.repay = repay;
+exports.rebalance = rebalance;
+exports.swapThenDeposit = swapThenDeposit;
+const umi_1 = require("@metaplex-foundation/umi");
+const services_1 = require("../services");
+const generalUtils_1 = require("./generalUtils");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+function openSolautoPosition(client, settingParams, dca) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.openPositionIx(settingParams, dca),
+    }), "open position");
+}
+function closeSolautoPosition(client) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.closePositionIx(),
+    }), "close position");
+}
+function updateSolautoPosition(client, settings, dca) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.updatePositionIx({
+            positionId: client.positionId,
+            settings,
+            dca,
+        }),
+    }), "update position");
+}
+function cancelSolautoDca(client) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.cancelDCAIx(),
+    }), "cancel DCA");
+}
+function deposit(client, baseUnitAmount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Deposit",
+            fields: [baseUnitAmount],
+        }),
+    }), "deposit");
+}
+function borrow(client, baseUnitAmount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Borrow",
+            fields: [baseUnitAmount],
+        }),
+    }), "borrow");
+}
+function withdraw(client, amount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Withdraw",
+            fields: [
+                amount === "All"
+                    ? { __kind: "All" }
+                    : { __kind: "Some", fields: [amount] },
+            ],
+        }),
+    }), "withdraw");
+}
+function repay(client, amount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Repay",
+            fields: [
+                amount === "All"
+                    ? { __kind: "All" }
+                    : { __kind: "Some", fields: [amount] },
+            ],
+        }),
+    }), "repay");
+}
+function rebalance(client, targetLiqUtilizationRateBps) {
+    return new services_1.TransactionItem(async (attemptNum) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps).buildRebalanceTx(attemptNum), "rebalance");
+}
+function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
+    return [
+        new services_1.TransactionItem(async () => {
+            const memeSwap = (0, generalUtils_1.tokenInfo)(client.pos.supplyMint()).isMeme;
+            const swapInput = {
+                inputMint: depositMint,
+                outputMint: client.pos.supplyMint(),
+                amount: depositAmountBaseUnit,
+                exactIn: true,
+                slippageBps: memeSwap ? 300 : 50,
+            };
+            const jupSwapManager = new services_1.JupSwapManager(client.signer);
+            const { setupIx, swapIx, cleanupIx, lookupTableAddresses } = await jupSwapManager.getJupSwapTxData({
+                ...swapInput,
+                destinationWallet: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey),
+                wrapAndUnwrapSol: true,
+            });
+            client.contextUpdates.new({
+                type: "jupSwap",
+                value: jupSwapManager.jupQuote,
+            });
+            return {
+                tx: (0, umi_1.transactionBuilder)().add([setupIx, swapIx, cleanupIx]),
+                lookupTableAddresses,
+                orderPrio: -1,
+            };
+        }, "swap"),
+        new services_1.TransactionItem(async () => {
+            const quoteOutAmount = client.contextUpdates.jupSwap?.outAmount;
+            return {
+                tx: (0, umi_1.transactionBuilder)().add(client.protocolInteractionIx({
+                    __kind: "Deposit",
+                    fields: [BigInt(Math.round(parseInt(quoteOutAmount) * 0.995))],
+                })),
+            };
+        }, "deposit"),
+    ];
+}

package/dist/utils/marginfiUtils.d.ts

@@ -2,17 +2,22 @@ import { PublicKey } from "@solana/web3.js";
 import { Program, Umi } from "@metaplex-foundation/umi";
 import { ProgramEnv, MarginfiAssetAccounts } from "../types";
 import { PositionState } from "../generated";
+import { MarginfiBankAccountsMap } from "../constants";
 import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { ContextUpdates } from "./solautoUtils";
-export declare function getMarginfiProgram(env: ProgramEnv): PublicKey;
-export declare function isMarginfiProgram(programId: PublicKey): boolean;
 export declare function createDynamicMarginfiProgram(env?: ProgramEnv): Program;
 export declare function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv): Umi;
+export declare function getAllBankRelatedAccounts(umi: Umi, bankAccountsMap: MarginfiBankAccountsMap): Promise<PublicKey[]>;
 export declare function fetchBankAddresses(umi: Umi, bankPk: PublicKey): Promise<{
     bank: PublicKey;
     liquidityVault: PublicKey;
     vaultAuthority: PublicKey | undefined;
+    priceOracle: PublicKey;
 }>;
+export declare function getMarginfiPriceOracle(umi: Umi, bank: {
+    pk?: PublicKey;
+    data?: Bank;
+}): Promise<PublicKey>;
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
     mint: PublicKey;
 }

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

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

package/dist/utils/marginfiUtils.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMarginfiProgram = getMarginfiProgram;
-exports.isMarginfiProgram = isMarginfiProgram;
 exports.createDynamicMarginfiProgram = createDynamicMarginfiProgram;
 exports.umiWithMarginfiProgram = umiWithMarginfiProgram;
+exports.getAllBankRelatedAccounts = getAllBankRelatedAccounts;
 exports.fetchBankAddresses = fetchBankAddresses;
+exports.getMarginfiPriceOracle = getMarginfiPriceOracle;
 exports.findMarginfiAccounts = findMarginfiAccounts;
 exports.calcMarginfiMaxLtvAndLiqThresholdBps = calcMarginfiMaxLtvAndLiqThresholdBps;
 exports.getMarginfiMaxLtvAndLiqThresholdBps = getMarginfiMaxLtvAndLiqThresholdBps;
@@ -24,17 +24,11 @@ const priceUtils_1 = require("./priceUtils");
 const generalUtils_1 = require("./generalUtils");
 const numberUtils_1 = require("./numberUtils");
 const accountUtils_1 = require("./accountUtils");
-function getMarginfiProgram(env) {
-    return env === "Prod" ? constants_1.MARGINFI_PROD_PROGRAM : constants_1.MARGINFI_STAGING_PROGRAM;
-}
-function isMarginfiProgram(programId) {
-    return (programId.equals(constants_1.MARGINFI_PROD_PROGRAM) ||
-        programId.equals(constants_1.MARGINFI_STAGING_PROGRAM));
-}
+const pythUtils_1 = require("./pythUtils");
 function createDynamicMarginfiProgram(env) {
     return {
         name: "marginfi",
-        publicKey: (0, umi_1.publicKey)(getMarginfiProgram(env ?? "Prod")),
+        publicKey: (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(env ?? "Prod").program),
         getErrorFromCode(code, cause) {
             return (0, marginfi_sdk_1.getMarginfiErrorFromCode)(code, this, cause);
         },
@@ -53,17 +47,56 @@ function umiWithMarginfiProgram(umi, marginfiEnv) {
         },
     });
 }
+async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
+    const banks = Object.values(bankAccountsMap).flatMap((group) => Object.values(group).map((accounts) => accounts.bank));
+    const banksData = await (0, marginfi_sdk_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
+    const oracles = banksData
+        .map((bank) => {
+        const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.config.oracleKeys[0]);
+        return bank.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
+            ? [
+                (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
+                (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
+            ]
+            : [oracleKey];
+    })
+        .flat()
+        .map((x) => x.toString());
+    const otherAccounts = Object.entries(bankAccountsMap).flatMap(([groupName, tokenMap]) => Object.values(tokenMap).flatMap((accounts) => [
+        groupName,
+        accounts.liquidityVault,
+        accounts.vaultAuthority,
+    ]));
+    return Array.from(new Set([...banks, ...oracles, ...otherAccounts]))
+        .filter((x) => x !== web3_js_1.PublicKey.default.toString())
+        .map((x) => new web3_js_1.PublicKey(x));
+}
 async function fetchBankAddresses(umi, bankPk) {
-    const bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bankPk));
+    const bank = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bankPk));
     const liquidityVault = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.liquidityVault);
     const vaultAuthority = (await (0, accountUtils_1.getTokenAccountData)(umi, liquidityVault))
         ?.owner;
+    const priceOracle = await getMarginfiPriceOracle(umi, { data: bank });
     return {
         bank: bankPk,
         liquidityVault,
         vaultAuthority,
+        priceOracle,
     };
 }
+async function getMarginfiPriceOracle(umi, bank) {
+    if (!bank.data) {
+        bank.data = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
+    }
+    const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
+    const priceOracle = bank.data.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
+        ? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, [
+            (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
+            (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
+        ])
+        : oracleKey;
+    return priceOracle;
+}
 function findMarginfiAccounts(bank) {
     const search = (bankAccounts) => {
         for (const group in bankAccounts) {

package/dist/utils/pythUtils.d.ts

@@ -0,0 +1,21 @@
+import { PublicKey } from "@solana/web3.js";
+import { Umi } from "@metaplex-foundation/umi";
+type PriceUpdateV2 = {
+    writeAuthority: Buffer;
+    verificationLevel: number;
+    priceMessage: {
+        feedId: Buffer;
+        price: bigint;
+        conf: bigint;
+        exponent: number;
+        publishTime: bigint;
+        prevPublishTime: bigint;
+        emaPrice: bigint;
+        emaConf: bigint;
+    };
+};
+export declare function parsePriceInfo(data: Uint8Array): PriceUpdateV2;
+export declare function getMostUpToDatePythOracle(umi: Umi, oracleKeys: PublicKey[]): Promise<PublicKey>;
+export declare function getPythPushOracleAddress(feedId: PublicKey, shardId: number, programId?: PublicKey): PublicKey;
+export {};
+//# sourceMappingURL=pythUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pythUtils.d.ts","sourceRoot":"","sources":["../../src/utils/pythUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAG/C,KAAK,aAAa,GAAG;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAwBF,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,CAM9D;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,sBAiBxB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,SAA6B,GACvC,SAAS,CAMX"}

package/dist/utils/pythUtils.js

@@ -0,0 +1,67 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parsePriceInfo = parsePriceInfo;
+exports.getMostUpToDatePythOracle = getMostUpToDatePythOracle;
+exports.getPythPushOracleAddress = getPythPushOracleAddress;
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("../constants");
+const generalUtils_1 = require("./generalUtils");
+const borsh = __importStar(require("borsh"));
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const priceUpdateV2Schema = {
+    struct: {
+        writeAuthority: {
+            array: { type: "u8", len: 32 },
+        },
+        verificationLevel: "u8",
+        priceMessage: {
+            struct: {
+                feedId: { array: { type: "u8", len: 32 } },
+                price: "i64",
+                conf: "u64",
+                exponent: "i32",
+                publishTime: "i64",
+                prevPublishTime: "i64",
+                emaPrice: "i64",
+                emaConf: "u64",
+            },
+        },
+        postedSlot: "u64",
+    },
+};
+function parsePriceInfo(data) {
+    let decoded = borsh.deserialize(priceUpdateV2Schema, data);
+    return decoded;
+}
+async function getMostUpToDatePythOracle(umi, oracleKeys) {
+    const oracles = (0, generalUtils_1.zip)(oracleKeys, (await umi.rpc.getAccounts(oracleKeys.map((x) => (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(x)), { commitment: "confirmed" })).map((x) => (x.exists ? parsePriceInfo(x.data.slice(8)) : undefined))).sort((a, b) => Number(b[1]?.priceMessage.publishTime ?? 0) -
+        Number(a[1]?.priceMessage.publishTime ?? 0));
+    return oracles[0][0];
+}
+function getPythPushOracleAddress(feedId, shardId, programId = constants_1.PYTH_PUSH_PROGRAM) {
+    const shardBytes = (0, generalUtils_1.u16ToArrayBufferLE)(shardId);
+    return web3_js_1.PublicKey.findProgramAddressSync([shardBytes, feedId.toBuffer()], programId)[0];
+}

package/dist/utils/solautoUtils.js

@@ -323,7 +323,7 @@ function getClient(lendingPlatform, txHandlerProps) {
     }
 }
 function isMarginfiClient(client) {
-    return client.lendingPlatform == generated_1.LendingPlatform.Marginfi;
+    return client.lendingPlatform === generated_1.LendingPlatform.Marginfi;
 }
 // TODO: PF
 function hasFirstRebalance(rebalanceType) {

package/local/txSandbox.ts

@@ -17,7 +17,7 @@ import {
 import { getSecretKey } from "./shared";
 
 const payForTransaction = false;
-const testProgram = true;
+const testProgram = false;
 
 export async function main() {
   const [, umi] = getSolanaRpcConnection(
@@ -38,8 +38,8 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 5,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    positionId: 1,
+    authority: new PublicKey("7ZN1w3ZE51FTXxdDjPPNpdZHuXWRvDK2h6osTHNXfsuL"),
   });
 
   const transactionItems: TransactionItem[] = [];

package/local/updateMarginfiLUT.ts

@@ -16,6 +16,7 @@ import {
   marginfiAccountInitialize,
   LOCAL_IRONFORGE_API_URL,
   getMarginfiAccounts,
+  getAllBankRelatedAccounts,
 } from "../src";
 import { createAndSendV0Tx, getSecretKey, updateLookupTable } from "./shared";
 
@@ -38,21 +39,14 @@ const solautoManager = createSignerFromKeypair(
 );
 
 async function addBanks() {
-  for (const group in mfiAccounts.bankAccounts) {
-    for (const key in mfiAccounts.bankAccounts[group]) {
-      const accounts = mfiAccounts.bankAccounts[group][key];
-      await updateLookupTable(
-        [
-          group,
-          accounts.bank,
-          accounts.liquidityVault,
-          accounts.vaultAuthority,
-          accounts.priceOracle,
-        ],
-        LOOKUP_TABLE_ADDRESS
-      );
-    }
-  }
+  const accounts = await getAllBankRelatedAccounts(
+    umi,
+    mfiAccounts.bankAccounts
+  );
+  await updateLookupTable(
+    accounts.map((x) => x.toString()),
+    LOOKUP_TABLE_ADDRESS
+  );
 }
 
 async function addImfiAccounts() {

package/package.json

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