@haven-fi/solauto-sdk 1.0.626 → 1.0.628

package/src/constants/marginfiAccounts.ts

@@ -5,10 +5,10 @@ import { MarginfiAssetAccounts } from "../types/accounts";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "./switchboardConstants";
 import { ProgramEnv } from "../types";
 
-export const MARGINFI_PROD_PROGRAM = new PublicKey(
+const MARGINFI_PROD_PROGRAM = new PublicKey(
   "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
 );
-export const MARGINFI_STAGING_PROGRAM = new PublicKey(
+const MARGINFI_STAGING_PROGRAM = new PublicKey(
   "stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct"
 );
 
@@ -18,150 +18,126 @@ const PROD_DEFAULT_MARGINFI_GROUP =
 const STAGING_DEFAULT_MARGINFI_GROUP =
   "FCPfpHA69EbS8f9KKSreTRkXbzFpunsKuYf5qNmnJjpo";
 
-const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
-
-export type MarginfiAccountsMap = {
+export type MarginfiBankAccountsMap = {
   [group: string]: { [token: string]: MarginfiAssetAccounts };
 };
 
-const MARGINFI_STAGING_ACCOUNTS: MarginfiAccountsMap = {
+const MARGINFI_STAGING_ACCOUNTS: MarginfiBankAccountsMap = {
   [STAGING_DEFAULT_MARGINFI_GROUP]: {
     [NATIVE_MINT.toString()]: {
       bank: "3evdJSa25nsUiZzEUzd92UNa13TPRJrje1dRyiQP5Lhp",
       liquidityVault: "FVXESa7wCd1tf3o9LGroBc3Ym8Gpcq1HdsLek6oo7Ykv",
       vaultAuthority: "DuYk1WGq8UsjW5ThLtaehFLrnJeupTjtF7TaPzja9LBQ",
-      priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE",
     },
     [tokens.USDC]: {
       bank: "Ek5JSFJFD8QgXM6rPDCzf31XhDp1q3xezaWYSkJWqbqc",
       liquidityVault: "6n7xXMni5WJKUMb4Vm5Zis6UaUtGF5xEGmagZNVWWoKB",
       vaultAuthority: "9mXNyA5yS4WSTpYUa5gi3yBrSJWWM7XNPNDWRzWGjdVe",
-      priceOracle: USDC_PRICE_ORACLE,
     },
     [tokens.USDT]: {
       bank: "4WFCsVXwfnQvZG52VvPwae7CtL13PUFVWdjkw5YCRBo6",
       liquidityVault: "BFSyniKfXU9rHqUvHLKeZMivQsAKWTE7HZ1fW6vZcvJp",
       vaultAuthority: "Fgxe3SUMzcNuLtT9Xkv8QhhWXCmu4VxynzUMwCF4HvJd",
-      priceOracle: "HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM",
     },
   },
 };
 
-const MARGINFI_PROD_ACCOUNTS: MarginfiAccountsMap = {
+const MARGINFI_PROD_ACCOUNTS: MarginfiBankAccountsMap = {
   [PROD_DEFAULT_MARGINFI_GROUP.toString()]: {
     [NATIVE_MINT.toString()]: {
       bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
       liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
       vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
-      priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE",
     },
     [tokens.B_SOL]: {
       bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
       liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
       vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
-      priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
     },
     [tokens.M_SOL]: {
       bank: "22DcjMZrMwC5Bpa5AGBsmjc5V9VuQrXG6N9ZtdUNyYGE",
       liquidityVault: "B6HqNn83a2bLqo4i5ygjLHJgD11ePtQksUyx4MjD55DV",
       vaultAuthority: "6YxGd65JbXzgFGWjE44jsyVeCnZp7Bb1wfL9jDia1n8w",
-      priceOracle: "5CKzb9j4ChgLUt8Gfm5CNGLN6khXKiqMbnGAW4cgXgxK",
     },
     [tokens.JITO_SOL]: {
       bank: "Bohoc1ikHLD7xKJuzTyiTyCwzaL5N7ggJQu75A8mKYM8",
       liquidityVault: "38VGtXd2pDPq9FMh1z6AVjcHCoHgvWyMhdNyamDTeeks",
       vaultAuthority: "7Ng54qf7BrCcZLqXmKA9WSR7SVRn4q6RX1YpLksBQ21A",
-      priceOracle: "AxaxyeDT8JnWERSaTKvFXvPKkEdxnamKSqpWbsSjYg1g",
     },
     [tokens.LST]: {
       bank: "DMoqjmsuoru986HgfjqrKEvPv8YBufvBGADHUonkadC5",
       liquidityVault: "DMQUXpb6K5L8osgV4x3NeEPUoJCf2VBgnA8FQusDjSou",
       vaultAuthority: "6PWVauGLhBFHUJspsnBVZHr56ZnbvmhSD2gS7czBHGpE",
-      priceOracle: "7aT9A5knp62jVvnEW33xaWopaPHa3Y7ggULyYiUsDhu8",
     },
     [tokens.INF]: {
       bank: "AwLRW3aPMMftXEjgWhTkYwM9CGBHdtKecvahCJZBwAqY",
       liquidityVault: "HQ1CGcqRshMhuonTGTnnmgw9ffcXxizGdZ6F6PKffWWi",
       vaultAuthority: "AEZb1XH5bfLwqk3hBKDuLfWyJKdLTgDPCkgn64BJKcvV",
-      priceOracle: "Ceg5oePJv1a6RR541qKeQaTepvERA3i8SvyueX9tT8Sq",
     },
     [tokens.H_SOL]: {
       bank: "GJCi1uj3kYPZ64puA5sLUiCQfFapxT2xnREzrbDzFkYY",
       liquidityVault: "8M97jkdr4rJtPnQ4yQ9stD6qVwaUvjrBdDPDbHJnPJLf",
       vaultAuthority: "8x7mgTn5RvHR8Tn3CJqexSuQwrs6MLEy8csuXCDVvvpt",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.H_SOL.toString()].feedId,
     },
     [tokens.JUP_SOL]: {
       bank: "8LaUZadNqtzuCG7iCvZd7d5cbquuYfv19KjAg6GPuuCb",
       liquidityVault: "B1zjqKPoYp9bTMhzFADaAvjyGb49FMitLpi6P3Pa3YR6",
       vaultAuthority: "93Qqsge2jHVsWLd8vas4cWghrsZJooMUr5JKN5DtcfMX",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.JUP_SOL.toString()].feedId,
     },
     [tokens.JUP]: {
       bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
       liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
       vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
-      priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
     },
     [tokens.JTO]: {
       bank: "EdB7YADw4XUt6wErT8kHGCUok4mnTpWGzPUU9rWDebzb",
       liquidityVault: "3bY1DEkXodGmPMG5f7ABA12228MBG5JdAAKf5cgkB6G1",
       vaultAuthority: "H2b4f2fGSKFortxwzrMZBnYVfr2yrKVUakg4Md9be3Wv",
-      priceOracle: "7ajR2zA4MGMMTqRAVjghTKqPPn4kbrj3pYkAVRVwTGzP",
     },
     [tokens.JLP]: {
       bank: "Amtw3n7GZe5SWmyhMhaFhDTi39zbTkLeWErBsmZXwpDa",
       liquidityVault: "9xfyL8gxbV77VvhdgFmacHyLEG4h7d2eDWkSMfhXUPQ",
       vaultAuthority: "F4RSGd4BRXscCqAVG3rFLiPVpo7v6j1drVqnvSM3rBKH",
-      priceOracle: "2TTGSRSezqFzeLUH8JwRUbtN66XLLaymfYsWRTMjfiMw",
     },
     [tokens.WBTC]: {
       bank: "BKsfDJCMbYep6gr9pq8PsmJbb5XGLHbAJzUV8vmorz7a",
       liquidityVault: "CMNdnjfaDQZo3VMoX31wZQBnSGu5FMmb1CnBaU4tApZk",
       vaultAuthority: "7P2TQHYgVJkXv1VPaREsL5Pi1gnNjVif5aF3pJewZ9kj",
-      priceOracle: "4cSM2e6rvbGQUFiJbqytoVMi5GgghSMr8LwVrT9VPSPo",
     },
     [tokens.WETH]: {
       bank: "BkUyfXjbBBALcfZvw76WAFRvYQ21xxMWWeoPtJrUqG3z",
       liquidityVault: "AxPJtiTEDksJWvCqNHCziK4uUcabqfmwW41dqtZrPFkp",
       vaultAuthority: "ELXogWuyXrFyUG1vevffVbEhVxdFrHf2GCJTtRGKBWdM",
-      priceOracle: "42amVS4KgzR9rA28tkVYqVXjq9Qa8dcZQMbH5EYFX6XC",
     },
     [tokens.HNT]: {
       bank: "JBcir4DPRPYVUpks9hkS1jtHMXejfeBo4xJGv3AYYHg6",
       liquidityVault: "E8Q7u5e9L9Uykx16em75ERT9wfbBPtkNL8gsRjoP8GB9",
       vaultAuthority: "AjsyrYpgaH275DBSnvNWdGK33hVycSFuXN87FKnX6fVY",
-      priceOracle: "4DdmDswskDxXGpwHrXUfn2CNUm9rt21ac79GHNTN3J33",
     },
     [tokens.PYTH]: {
       bank: "E4td8i8PT2BZkMygzW4MGHCv2KPPs57dvz5W2ZXf9Twu",
       liquidityVault: "DUrAkkaMAckzes7so9T5frXm9YFFgjAAm3MMwHwTfVJq",
       vaultAuthority: "9b5KdVnbbfEQ2qhLeFjWvcAx2VWe9XHx7ZgayZyL9a6C",
-      priceOracle: "8vjchtMuJNY4oFQdTi8yCe6mhCaNBFaUbktT482TpLPS",
     },
     [tokens.USDC]: {
       bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
       liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
       vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
-      priceOracle: USDC_PRICE_ORACLE,
     },
     [tokens.USDT]: {
       bank: "HmpMfL8942u22htC4EMiWgLX931g3sacXFR6KjuLgKLV",
       liquidityVault: "77t6Fi9qj4s4z22K1toufHtstM8rEy7Y3ytxik7mcsTy",
       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"]: {
@@ -169,13 +145,11 @@ const MARGINFI_PROD_ACCOUNTS: MarginfiAccountsMap = {
       bank: "845oEvt1oduoBj5zQxTr21cWWaUVnRjGerJuW3yMo2nn",
       liquidityVault: "At6R64ip51zay4dT6k1WnVGETSMcaiY5vggD5DVTgxri",
       vaultAuthority: "dNraDCWb5usDSoW4kD1Mi2E9WsNu6EABcQZqnrDfjNb",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.POPCAT.toString()].feedId,
     },
     [tokens.USDC]: {
       bank: "EXrnNVfLagt3j4hCHSD9WqK75o6dkZBtjpnrSrSC78MA",
       liquidityVault: "D9HSUYz3Rg2cTH65dUPaQS1MYxofNTeLecsAjiBgVPur",
       vaultAuthority: "5ivKgJnxQ9CewJcKYSPQUiQFdfJki6YS87FqohnMSsFM",
-      priceOracle: USDC_PRICE_ORACLE,
     },
   },
   ["EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"]: {
@@ -183,14 +157,11 @@ const MARGINFI_PROD_ACCOUNTS: MarginfiAccountsMap = {
       bank: "3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM",
       liquidityVault: "863K9YPVT3xbUGFZevrQJLqMux3UdRkwNQ6usAp4hJyy",
       vaultAuthority: "Qsv2rnNRdv59AwRU3YmGPMCTdKT41CDAKyYAr4srCJR",
-      priceOracle:
-        SWITCHBOARD_PRICE_FEED_IDS[tokens.RETARDIO.toString()].feedId,
     },
     [tokens.USDC]: {
       bank: "6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5",
       liquidityVault: "7orVfNL5ZjqvdSaDgYLgBk4i5B3AnwFXNqqAvJbx6DFy",
       vaultAuthority: "G4Azxk4PYtNRmDZkJppYo3rNAinkZXzYpQPG5dVDh4Nj",
-      priceOracle: USDC_PRICE_ORACLE,
     },
   },
   ["G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"]: {
@@ -198,13 +169,11 @@ const MARGINFI_PROD_ACCOUNTS: MarginfiAccountsMap = {
       bank: "Dj3PndQ3j1vuga5ApiFWWAfQ4h3wBtgS2SeLZBT2LD4g",
       liquidityVault: "BRcRMDVPBQzXNXWtSS6bNotcGxhVsxfiAt1qf8nFVUpx",
       vaultAuthority: "36SgFh1qBRyj1PEhsn7Kg9Sfwbrn7rHP7kvTM5o5n6AL",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.BILLY.toString()].feedId,
     },
     [tokens.USDC]: {
       bank: "A7vBgCowCYeja7GTc3pyqUBdC9Gkue2gWaMjGZW38meM",
       liquidityVault: "DBGhZ8TJTG2Pacdva27zY9etaro24o1tTA3LToSjYHbx",
       vaultAuthority: "Cg6BCqkGny7A2AXCV8rikhHXM82wqqfzmdsTobEeTQkH",
-      priceOracle: USDC_PRICE_ORACLE,
     },
   },
   ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
@@ -212,13 +181,11 @@ const MARGINFI_PROD_ACCOUNTS: MarginfiAccountsMap = {
       bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
       liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
       vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()].feedId,
     },
     [tokens.USDC]: {
       bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
       liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
       vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
-      priceOracle: USDC_PRICE_ORACLE,
     },
   },
 };
@@ -233,7 +200,7 @@ export interface MarginfiProgramAccounts {
   program: PublicKey;
   defaultGroup: PublicKey;
   lookupTable: PublicKey;
-  bankAccounts: MarginfiAccountsMap;
+  bankAccounts: MarginfiBankAccountsMap;
 }
 
 export function getMarginfiAccounts(
@@ -268,3 +235,10 @@ export function getMarginfiAccounts(
     };
   }
 }
+
+export function isMarginfiProgram(programId: PublicKey) {
+  return (
+    programId.equals(MARGINFI_PROD_PROGRAM) ||
+    programId.equals(MARGINFI_STAGING_PROGRAM)
+  );
+}

package/src/constants/pythConstants.ts

@@ -1,5 +1,13 @@
 import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
+import { PublicKey } from "@solana/web3.js";
+
+export const PYTH_PUSH_PROGRAM = new PublicKey(
+  "pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT"
+);
+
+export const PYTH_SPONSORED_SHARD_ID = 0;
+export const MARGINFI_SPONSORED_SHARD_ID = 3301;
 
 // https://pyth.network/developers/price-feed-ids#solana-stable
 export const PYTH_PRICE_FEED_IDS = {

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -29,6 +29,7 @@ import {
   fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getEmptyMarginfiAccountsByAuthority,
+  getMarginfiPriceOracle,
   getTokenAccount,
   rpcAccountCreated,
   safeGetPrice,
@@ -72,15 +73,15 @@ export class MarginfiFlProvider extends FlProviderBase {
     const bankAccounts = getMarginfiAccounts(this.programEnv).bankAccounts;
 
     const availableBanks: string[] = [];
-    const checkIfUsable = (group: string, mint: PublicKey) => {
-      if (Object.keys(bankAccounts[group]).includes(mint.toString())) {
-        availableBanks.push(bankAccounts[group][mint.toString()].bank);
+    const checkIfUsable = (group: string, mint: string) => {
+      if (Object.keys(bankAccounts[group]).includes(mint)) {
+        availableBanks.push(bankAccounts[group][mint].bank);
       }
     };
 
     for (const group of Object.keys(bankAccounts)) {
-      checkIfUsable(group, this.supplyMint);
-      checkIfUsable(group, this.debtMint);
+      checkIfUsable(group, this.supplyMint.toString());
+      checkIfUsable(group, this.debtMint.toString());
     }
 
     const banks = await safeFetchAllBank(
@@ -301,11 +302,10 @@ export class MarginfiFlProvider extends FlProviderBase {
             flBankHadPrevBalance = true;
           }
 
-          // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
-          // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
-          // const priceOracle = bankData!.config.oracleKeys[0];
           const priceOracle = publicKey(
-            findMarginfiAccounts(toWeb3JsPublicKey(x.bankPk)).priceOracle
+            await getMarginfiPriceOracle(this.umi, {
+              pk: toWeb3JsPublicKey(x.bankPk),
+            })
           );
 
           remainingAccounts.push(

package/src/services/solauto/solautoClient.ts

@@ -205,12 +205,8 @@ export abstract class SolautoClient extends ReferralStateManager {
     return [
       this.authority,
       ...(this.authorityLutAddress ? [this.authorityLutAddress] : []),
-      ...(toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority)
-        ? [this.signerSupplyTa]
-        : []),
-      ...(toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority)
-        ? [this.signerDebtTa]
-        : []),
+      this.signerSupplyTa,
+      this.signerDebtTa,
       this.pos.publicKey,
       this.positionSupplyTa,
       this.positionDebtTa,
@@ -239,6 +235,10 @@ export abstract class SolautoClient extends ReferralStateManager {
       }
     | undefined
   > {
+    if (!toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority)) {
+      return undefined;
+    }
+
     const existingLutAccounts = await this.fetchExistingAuthorityLutAccounts();
     if (
       this.lutAccountsToAdd().every((element) =>

package/src/services/solauto/solautoMarginfiClient.ts

@@ -32,6 +32,7 @@ import {
   hasFirstRebalance,
 } from "../../utils";
 import {
+  Bank,
   lendingAccountBorrow,
   lendingAccountDeposit,
   lendingAccountRepay,
@@ -113,19 +114,12 @@ export class SolautoMarginfiClient extends SolautoClient {
         this.pos.debtMint().toString()
       ]!;
 
-    // TODO: Don't dynamically pull oracle from bank until Marginfi sorts out their price oracle issues.
-    // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
-    //   publicKey(this.marginfiSupplyAccounts.bank),
-    //   publicKey(this.marginfiDebtAccounts.bank),
-    // ]);
-    // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
-    // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
-    this.supplyPriceOracle = new PublicKey(
-      this.marginfiSupplyAccounts.priceOracle
-    );
-    this.debtPriceOracle = new PublicKey(this.marginfiDebtAccounts.priceOracle);
+    [this.supplyPriceOracle, this.debtPriceOracle] =
+      await this.pos.priceOracles();
 
     this.log("Marginfi account:", this.marginfiAccountPk.toString());
+    this.log("Supply price oracle:", this.supplyPriceOracle.toString());
+    this.log("Debt price oracle:", this.debtPriceOracle.toString());
   }
 
   defaultLookupTables(): string[] {

package/src/services/transactions/transactionUtils.ts

@@ -39,7 +39,6 @@ import {
   getTokenAccount,
   getTokenAccountData,
   isMarginfiClient,
-  isMarginfiProgram,
 } from "../../utils";
 import {
   createMarginfiProgram,
@@ -56,6 +55,7 @@ import {
   JUPITER_PROGRAM_ID,
 } from "../../jupiter-sdk";
 import { TransactionItemInputs, BundleSimulationError } from "../../types";
+import { isMarginfiProgram } from "../../constants";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -13,11 +13,15 @@ import {
   fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getMarginfiAccountPositionState,
+  getMarginfiPriceOracle,
 } from "../utils";
 import { getMarginfiAccounts } from "../constants";
 import { SolautoPositionEx } from "./solautoPositionEx";
+import { LendingPlatform } from "../generated";
 
 export class MarginfiSolautoPositionEx extends SolautoPositionEx {
+  lendingPlatform = LendingPlatform.Marginfi;
+
   private marginfiAccountData: MarginfiAccount | null = null;
   private supplyBank: Bank | null = null;
   private debtBank: Bank | null = null;
@@ -47,7 +51,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     return this.lp;
   }
 
-  async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
+  async getBanks(): Promise<Bank[]> {
     if (!this.supplyBank || !this.debtBank) {
       const group = (await this.lendingPool()).toString();
       const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
@@ -60,10 +64,25 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       ]);
     }
 
+    return [this.supplyBank!, this.debtBank!];
+  }
+
+  async priceOracles(): Promise<PublicKey[]> {
+    const [supplyBank, debtBank] = await this.getBanks();
+
+    return await Promise.all([
+      getMarginfiPriceOracle(this.umi, { data: supplyBank }),
+      getMarginfiPriceOracle(this.umi, { data: debtBank }),
+    ]);
+  }
+
+  async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
+    const [supplyBank, debtBank] = await this.getBanks();
+
     const [supplyPrice] = await fetchTokenPrices([this.supplyMint()]);
     const [maxLtvBps, liqThresholdBps] = calcMarginfiMaxLtvAndLiqThresholdBps(
-      this.supplyBank,
-      this.debtBank,
+      supplyBank,
+      debtBank,
       supplyPrice
     );
 

package/src/solautoPosition/solautoPositionEx.ts

@@ -67,6 +67,7 @@ interface PositionExArgs {
 }
 
 export abstract class SolautoPositionEx {
+  public lendingPlatform!: LendingPlatform;
   public umi!: Umi;
   public publicKey!: PublicKey;
   protected _data!: SolautoPositionExData;
@@ -226,6 +227,7 @@ export abstract class SolautoPositionEx {
   }
 
   abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
+  abstract priceOracles(): Promise<PublicKey[]>;
   abstract supplyLiquidityAvailable(): number;
 
   sufficientLiquidityToBoost() {

package/src/solautoPosition/utils.ts

@@ -41,7 +41,7 @@ export async function getPositionExBulk(
   umi: Umi,
   publicKeys: PublicKey[]
 ): Promise<SolautoPositionEx[]> {
-  const batches = getBatches(publicKeys, 30);
+  const batches = getBatches(publicKeys, 50);
 
   const data = (
     await Promise.all(

package/src/types/accounts.ts

@@ -2,5 +2,4 @@ export interface MarginfiAssetAccounts {
   bank: string;
   liquidityVault: string;
   vaultAuthority: string;
-  priceOracle: string;
 }

package/src/utils/generalUtils.ts

@@ -184,3 +184,15 @@ export async function customRpcCall(umi: Umi, method: string, params?: any) {
     return data;
   }
 }
+
+export function u16ToArrayBufferLE(value: number): Uint8Array {
+  // 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/src/utils/index.ts

@@ -1,5 +1,6 @@
 export * from "./accountUtils";
 export * from "./generalUtils";
+export * from "./instructionUtils";
 export * from "./jitoUtils";
 export * from "./jupiterUtils";
 export * from "./marginfiUtils";
@@ -8,4 +9,5 @@ export * from "./solautoUtils";
 export * from "./solanaUtils";
 export * from "./stringUtils";
 export * from "./priceUtils";
+export * from "./pythUtils";
 export * from "./switchboardUtils";

package/src/utils/instructionUtils.ts

@@ -0,0 +1,181 @@
+import { OptionOrNullable, transactionBuilder } from "@metaplex-foundation/umi";
+import {
+  DCASettingsInpArgs,
+  SolautoSettingsParametersInpArgs,
+} from "../generated";
+import {
+  JupSwapManager,
+  RebalanceTxBuilder,
+  SolautoClient,
+  SwapInput,
+  TransactionItem,
+} from "../services";
+import { PublicKey } from "@solana/web3.js";
+import { tokenInfo } from "./generalUtils";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+
+export function openSolautoPosition(
+  client: SolautoClient,
+  settingParams: SolautoSettingsParametersInpArgs,
+  dca?: DCASettingsInpArgs
+) {
+  return new TransactionItem(
+    async () => ({
+      tx: client!.openPositionIx(settingParams, dca),
+    }),
+    "open position"
+  );
+}
+
+export function closeSolautoPosition(client: SolautoClient) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.closePositionIx(),
+    }),
+    "close position"
+  );
+}
+
+export function updateSolautoPosition(
+  client: SolautoClient,
+  settings: OptionOrNullable<SolautoSettingsParametersInpArgs>,
+  dca: OptionOrNullable<DCASettingsInpArgs>
+) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.updatePositionIx({
+        positionId: client.positionId,
+        settings,
+        dca,
+      }),
+    }),
+    "update position"
+  );
+}
+
+export function cancelSolautoDca(client: SolautoClient) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.cancelDCAIx(),
+    }),
+    "cancel DCA"
+  );
+}
+
+export function deposit(client: SolautoClient, baseUnitAmount: bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Deposit",
+        fields: [baseUnitAmount],
+      }),
+    }),
+    "deposit"
+  );
+}
+
+export function borrow(client: SolautoClient, baseUnitAmount: bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Borrow",
+        fields: [baseUnitAmount],
+      }),
+    }),
+    "borrow"
+  );
+}
+
+export function withdraw(client: SolautoClient, amount: "All" | bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Withdraw",
+        fields: [
+          amount === "All"
+            ? { __kind: "All" }
+            : { __kind: "Some", fields: [amount] },
+        ],
+      }),
+    }),
+    "withdraw"
+  );
+}
+
+export function repay(client: SolautoClient, amount: "All" | bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Repay",
+        fields: [
+          amount === "All"
+            ? { __kind: "All" }
+            : { __kind: "Some", fields: [amount] },
+        ],
+      }),
+    }),
+    "repay"
+  );
+}
+
+export function rebalance(
+  client: SolautoClient,
+  targetLiqUtilizationRateBps?: number
+) {
+  return new TransactionItem(
+    async (attemptNum) =>
+      await new RebalanceTxBuilder(
+        client,
+        targetLiqUtilizationRateBps
+      ).buildRebalanceTx(attemptNum),
+    "rebalance"
+  );
+}
+
+export function swapThenDeposit(
+  client: SolautoClient,
+  depositMint: PublicKey,
+  depositAmountBaseUnit: bigint
+) {
+  return [
+    new TransactionItem(async () => {
+      const memeSwap = tokenInfo(client.pos.supplyMint()).isMeme;
+      const swapInput: SwapInput = {
+        inputMint: depositMint,
+        outputMint: client.pos.supplyMint(),
+        amount: depositAmountBaseUnit,
+        exactIn: true,
+        slippageBps: memeSwap ? 300 : 50,
+      };
+      const jupSwapManager = new JupSwapManager(client.signer);
+      const { setupIx, swapIx, cleanupIx, lookupTableAddresses } =
+        await jupSwapManager.getJupSwapTxData({
+          ...swapInput,
+          destinationWallet: toWeb3JsPublicKey(client.signer.publicKey),
+          wrapAndUnwrapSol: true,
+        });
+
+      client.contextUpdates.new({
+        type: "jupSwap",
+        value: jupSwapManager.jupQuote!,
+      });
+
+      return {
+        tx: transactionBuilder().add([setupIx, swapIx, cleanupIx]),
+        lookupTableAddresses,
+        orderPrio: -1,
+      };
+    }, "swap"),
+    new TransactionItem(async () => {
+      const quoteOutAmount = client.contextUpdates.jupSwap?.outAmount;
+      return {
+        tx: transactionBuilder().add(
+          client.protocolInteractionIx({
+            __kind: "Deposit",
+            fields: [BigInt(Math.round(parseInt(quoteOutAmount!) * 0.995))],
+          })
+        ),
+      };
+    }, "deposit"),
+  ];
+}