@haven-fi/solauto-sdk 1.0.670 → 1.0.672

package/src/services/solauto/solautoMarginfiClient.ts

@@ -75,7 +75,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     this.mfiAccounts = getMarginfiAccounts(this.lpEnv);
 
-    this.marginfiGroup = await this.pos.lendingPool();
+    this.marginfiGroup = this.pos.lpPoolAccount;
 
     if (this.pos.selfManaged) {
       this.marginfiAccount =

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -1,12 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
-import {
-  Bank,
-  fetchMarginfiAccount,
-  MarginfiAccount,
-  safeFetchAllBank,
-} from "../marginfi-sdk";
+import { Bank, safeFetchAllBank } from "../marginfi-sdk";
 import { publicKey } from "@metaplex-foundation/umi";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   calcMarginfiMaxLtvAndLiqThresholdBps,
   fetchTokenPrices,
@@ -23,34 +17,12 @@ import { LendingPlatform, PriceType } 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;
 
-  public async lendingPool(): Promise<PublicKey> {
-    if (this.lp) {
-      return this.lp;
-    }
-
-    if (!this.marginfiAccountData && validPubkey(this.lpUserAccount)) {
-      this.marginfiAccountData = await fetchMarginfiAccount(
-        this.umi,
-        publicKey(this.lpUserAccount!),
-        { commitment: "confirmed" }
-      );
-      this.lp = toWeb3JsPublicKey(this.marginfiAccountData.group);
-    }
-
-    if (!this.lp) {
-      this.lp = getMarginfiAccounts(this.lpEnv).defaultGroup;
-    }
-
-    return this.lp;
-  }
-
   async getBanks(): Promise<Bank[]> {
     if (!this.supplyBank || !this.debtBank) {
-      const group = (await this.lendingPool()).toString();
+      const group = this.lpPoolAccount.toString();
       const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
       const supplyBank = bankAccounts[group][this.supplyMint.toString()].bank;
       const debtBank = bankAccounts[group][this.debtMint.toString()].bank;
@@ -102,10 +74,9 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     const resp = await getMarginfiAccountPositionState(
       this.umi,
       { pk: this.lpUserAccount },
-      await this.lendingPool(),
+      this._lpPoolAccount,
       useDesignatedMint ? { mint: this.supplyMint } : undefined,
       useDesignatedMint ? { mint: this.debtMint } : undefined,
-      this.lpEnv,
       this.contextUpdates,
       priceType
     );
@@ -113,6 +84,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     if (resp) {
       this.supplyBank = resp.supplyBank;
       this.debtBank = resp.debtBank;
+      this._lpPoolAccount = resp.marginfiGroup;
       this._data.state = resp.state;
     }
   }

package/src/solautoPosition/positionUtils.ts

@@ -113,11 +113,18 @@ export async function getOrCreatePositionEx(
     contextUpdates,
   };
 
+  let position: SolautoPositionEx;
   switch (lendingPlatform) {
     case LendingPlatform.Marginfi:
-      return new MarginfiSolautoPositionEx(args);
+      position = new MarginfiSolautoPositionEx(args);
     // TODO: PF
   }
+
+  if (position.selfManaged) {
+    await position.refreshPositionState();
+  }
+
+  return position;
 }
 
 interface AssetProps {

package/src/solautoPosition/solautoPositionEx.ts

@@ -5,7 +5,6 @@ import {
   toWeb3JsPublicKey,
 } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  DCASettings,
   fetchSolautoPosition,
   LendingPlatform,
   PositionState,
@@ -51,7 +50,7 @@ export interface PositionCustomArgs {
   lendingPlatform: LendingPlatform;
   supplyMint?: PublicKey;
   debtMint?: PublicKey;
-  lendingPool?: PublicKey;
+  lpPoolAccount?: PublicKey;
   lpUserAccount?: PublicKey;
   lpEnv?: ProgramEnv;
 }
@@ -79,12 +78,12 @@ export abstract class SolautoPositionEx {
   public lendingPlatform!: LendingPlatform;
   public positionId!: number;
   public authority!: PublicKey;
-  protected _data!: SolautoPositionExData;
-  protected lp?: PublicKey = undefined;
+  protected _lpPoolAccount?: PublicKey;
   public lpUserAccount?: PublicKey = undefined;
   protected lpEnv!: ProgramEnv;
   private _supplyMint?: PublicKey;
   private _debtMint?: PublicKey;
+  protected _data!: SolautoPositionExData;
 
   private readonly firstState!: PositionState;
 
@@ -107,15 +106,15 @@ export abstract class SolautoPositionEx {
     this.positionId = args.positionId ?? args.data.positionId![0];
     this.authority = args.authority ?? toWeb3JsPublicKey(args.data.authority!);
 
-    this._supplyMint = args.customArgs?.supplyMint;
-    this._debtMint = args.customArgs?.debtMint;
-    this.lp = args.customArgs?.lendingPool;
+    this._lpPoolAccount = args.customArgs?.lpPoolAccount;
     this.lpUserAccount =
       args.customArgs?.lpUserAccount ??
       (args.data.position
         ? toWeb3JsPublicKey(args.data.position!.lpUserAccount)
         : undefined);
     this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
+    this._supplyMint = args.customArgs?.supplyMint;
+    this._debtMint = args.customArgs?.debtMint;
 
     this._data = args.data;
     this.firstState = { ...args.data.state };
@@ -123,8 +122,6 @@ export abstract class SolautoPositionEx {
     this.rebalance = new PositionRebalanceHelper(this);
   }
 
-  abstract lendingPool(): Promise<PublicKey>;
-
   get exists() {
     return this._data.position !== undefined;
   }
@@ -141,6 +138,13 @@ export abstract class SolautoPositionEx {
     return solautoStrategyName(this.supplyMint, this.debtMint);
   }
 
+  get lpPoolAccount() {
+    return (
+      this._lpPoolAccount ??
+      toWeb3JsPublicKey(this.data.position!.lpPoolAccount)
+    );
+  }
+
   liqUtilizationRateBps(priceType?: PriceType): number {
     return getLiqUtilzationRateBps(
       this.supplyUsd(priceType),
@@ -165,14 +169,6 @@ export abstract class SolautoPositionEx {
     this.data.position!.settings = settings;
   }
 
-  get dca(): DCASettings | undefined {
-    return this.contextUpdates?.dca ?? this.data.position?.dca;
-  }
-
-  updateDca(dca: DCASettings) {
-    this.data.position!.dca = dca;
-  }
-
   get supplyMint(): PublicKey {
     return this._supplyMint ?? toWeb3JsPublicKey(this.state.supply.mint);
   }
@@ -488,7 +484,7 @@ class PositionRebalanceHelper {
     bpsDistanceThreshold: number,
     skipExtraChecks?: boolean
   ): RebalanceAction | undefined {
-    if (!this.pos.settings || !this.pos.supplyUsd()) {
+    if (this.pos.selfManaged || !this.pos.supplyUsd()) {
       return undefined;
     }
 

package/src/utils/marginfi/data.ts

@@ -1,8 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { publicKey, Umi } from "@metaplex-foundation/umi";
-import {
-  toWeb3JsPublicKey,
-} from "@metaplex-foundation/umi-web3js-adapters";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { ProgramEnv } from "../../types";
 import { PositionState, PositionTokenState, PriceType } from "../../generated";
 import {
@@ -31,7 +29,10 @@ import {
   toBaseUnit,
   toBps,
 } from "../numberUtils";
-import { calcMarginfiMaxLtvAndLiqThresholdBps, marginfiAccountEmpty } from "./general";
+import {
+  calcMarginfiMaxLtvAndLiqThresholdBps,
+  marginfiAccountEmpty,
+} from "./general";
 
 export async function getMarginfiMaxLtvAndLiqThresholdBps(
   umi: Umi,
@@ -309,11 +310,15 @@ export async function getMarginfiAccountPositionState(
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
-  programEnv?: ProgramEnv,
   contextUpdates?: ContextUpdates,
   priceType?: PriceType
 ): Promise<
-  | { supplyBank: Bank | null; debtBank: Bank | null; state: PositionState }
+  | {
+      supplyBank: Bank | null;
+      debtBank: Bank | null;
+      marginfiGroup: PublicKey;
+      state: PositionState;
+    }
   | undefined
 > {
   let marginfiAccount =
@@ -437,10 +442,13 @@ export async function getMarginfiAccountPositionState(
     );
   }
 
+  if (!marginfiGroup) {
+    marginfiGroup = toWeb3JsPublicKey(supplyBank.group);
+  }
   const supplyPrice = safeGetPrice(toWeb3JsPublicKey(supplyBank.mint))!;
   let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(
     umi,
-    marginfiGroup ?? getMarginfiAccounts(programEnv).defaultGroup,
+    marginfiGroup,
     {
       mint: toWeb3JsPublicKey(supplyBank.mint),
       bank: supplyBank,
@@ -463,6 +471,7 @@ export async function getMarginfiAccountPositionState(
   return {
     supplyBank,
     debtBank,
+    marginfiGroup,
     state: {
       liqUtilizationRateBps: getLiqUtilzationRateBps(
         supplyUsd,

package/dist/constants/generalConstants.d.ts

@@ -1,7 +0,0 @@
-import { PublicKey } from "@solana/web3.js";
-export declare const USD_DECIMALS = 9;
-export declare const SOLAUTO_FEES_WALLET: PublicKey;
-export declare const SOLAUTO_MANAGER: PublicKey;
-export declare const LOCAL_IRONFORGE_API_URL: string;
-export declare const BASIS_POINTS = 10000;
-//# sourceMappingURL=generalConstants.d.ts.map

package/dist/constants/generalConstants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generalConstants.d.ts","sourceRoot":"","sources":["../../src/constants/generalConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,eAAO,MAAM,mBAAmB,WAAgE,CAAC;AACjG,eAAO,MAAM,eAAe,WAA+D,CAAC;AAE5F,eAAO,MAAM,uBAAuB,QAAuD,CAAC;AAE5F,eAAO,MAAM,YAAY,QAAQ,CAAC"}

package/dist/constants/generalConstants.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BASIS_POINTS = exports.LOCAL_IRONFORGE_API_URL = exports.SOLAUTO_MANAGER = exports.SOLAUTO_FEES_WALLET = exports.USD_DECIMALS = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const utils_1 = require("../utils");
-exports.USD_DECIMALS = 9;
-exports.SOLAUTO_FEES_WALLET = new web3_js_1.PublicKey("AprYCPiVeKMCgjQ2ZufwChMzvQ5kFjJo2ekTLSkXsQDm");
-exports.SOLAUTO_MANAGER = new web3_js_1.PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJVGxuJXhHCY");
-exports.LOCAL_IRONFORGE_API_URL = (0, utils_1.buildIronforgeApiUrl)(process.env.IRONFORGE_API_KEY);
-exports.BASIS_POINTS = 10000;

package/dist/constants/index.d.ts

@@ -1,7 +0,0 @@
-export * from "./generalConstants";
-export * from "./marginfiAccounts";
-export * from "./pythConstants";
-export * from "./solautoConstants";
-export * from "./switchboardConstants";
-export * from "./tokenConstants";
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC"}

package/dist/constants/index.js

@@ -1,22 +0,0 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./generalConstants"), exports);
-__exportStar(require("./marginfiAccounts"), exports);
-__exportStar(require("./pythConstants"), exports);
-__exportStar(require("./solautoConstants"), exports);
-__exportStar(require("./switchboardConstants"), exports);
-__exportStar(require("./tokenConstants"), exports);

package/dist/constants/marginfiAccounts.d.ts

@@ -1,17 +0,0 @@
-import { PublicKey } from "@solana/web3.js";
-import { MarginfiAssetAccounts } from "../types/accounts";
-import { ProgramEnv } from "../types";
-export type MarginfiBankAccountsMap = {
-    [group: string]: {
-        [token: string]: MarginfiAssetAccounts;
-    };
-};
-export interface MarginfiProgramAccounts {
-    program: PublicKey;
-    defaultGroup: PublicKey;
-    lookupTable: PublicKey;
-    bankAccounts: MarginfiBankAccountsMap;
-}
-export declare function getMarginfiAccounts(programEnv?: ProgramEnv, marginfiGroup?: PublicKey): MarginfiProgramAccounts;
-export declare function isMarginfiProgram(programId: PublicKey): boolean;
-//# sourceMappingURL=marginfiAccounts.d.ts.map

package/dist/constants/marginfiAccounts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAetC,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAC7D,CAAC;AAgLF,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,uBAAuB,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,SAAS,GACxB,uBAAuB,CA4BzB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,WAKrD"}

package/dist/constants/marginfiAccounts.js

@@ -1,234 +0,0 @@
-"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.getMarginfiAccounts = getMarginfiAccounts;
-exports.isMarginfiProgram = isMarginfiProgram;
-const web3_js_1 = require("@solana/web3.js");
-const spl_token_1 = require("@solana/spl-token");
-const tokens = __importStar(require("./tokenConstants"));
-const MARGINFI_PROD_PROGRAM = new web3_js_1.PublicKey("MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA");
-const MARGINFI_STAGING_PROGRAM = new web3_js_1.PublicKey("stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct");
-const PROD_DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
-const STAGING_DEFAULT_MARGINFI_GROUP = "FCPfpHA69EbS8f9KKSreTRkXbzFpunsKuYf5qNmnJjpo";
-const MARGINFI_STAGING_ACCOUNTS = {
-    [STAGING_DEFAULT_MARGINFI_GROUP]: {
-        [spl_token_1.NATIVE_MINT.toString()]: {
-            bank: "3evdJSa25nsUiZzEUzd92UNa13TPRJrje1dRyiQP5Lhp",
-            liquidityVault: "FVXESa7wCd1tf3o9LGroBc3Ym8Gpcq1HdsLek6oo7Ykv",
-            vaultAuthority: "DuYk1WGq8UsjW5ThLtaehFLrnJeupTjtF7TaPzja9LBQ",
-        },
-        [tokens.USDC]: {
-            bank: "Ek5JSFJFD8QgXM6rPDCzf31XhDp1q3xezaWYSkJWqbqc",
-            liquidityVault: "6n7xXMni5WJKUMb4Vm5Zis6UaUtGF5xEGmagZNVWWoKB",
-            vaultAuthority: "9mXNyA5yS4WSTpYUa5gi3yBrSJWWM7XNPNDWRzWGjdVe",
-        },
-        [tokens.USDT]: {
-            bank: "4WFCsVXwfnQvZG52VvPwae7CtL13PUFVWdjkw5YCRBo6",
-            liquidityVault: "BFSyniKfXU9rHqUvHLKeZMivQsAKWTE7HZ1fW6vZcvJp",
-            vaultAuthority: "Fgxe3SUMzcNuLtT9Xkv8QhhWXCmu4VxynzUMwCF4HvJd",
-        },
-    },
-};
-const MARGINFI_PROD_ACCOUNTS = {
-    [PROD_DEFAULT_MARGINFI_GROUP.toString()]: {
-        [spl_token_1.NATIVE_MINT.toString()]: {
-            bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
-            liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
-            vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
-        },
-        [tokens.B_SOL]: {
-            bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
-            liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
-            vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
-        },
-        [tokens.M_SOL]: {
-            bank: "22DcjMZrMwC5Bpa5AGBsmjc5V9VuQrXG6N9ZtdUNyYGE",
-            liquidityVault: "B6HqNn83a2bLqo4i5ygjLHJgD11ePtQksUyx4MjD55DV",
-            vaultAuthority: "6YxGd65JbXzgFGWjE44jsyVeCnZp7Bb1wfL9jDia1n8w",
-        },
-        [tokens.JITO_SOL]: {
-            bank: "Bohoc1ikHLD7xKJuzTyiTyCwzaL5N7ggJQu75A8mKYM8",
-            liquidityVault: "38VGtXd2pDPq9FMh1z6AVjcHCoHgvWyMhdNyamDTeeks",
-            vaultAuthority: "7Ng54qf7BrCcZLqXmKA9WSR7SVRn4q6RX1YpLksBQ21A",
-        },
-        [tokens.LST]: {
-            bank: "DMoqjmsuoru986HgfjqrKEvPv8YBufvBGADHUonkadC5",
-            liquidityVault: "DMQUXpb6K5L8osgV4x3NeEPUoJCf2VBgnA8FQusDjSou",
-            vaultAuthority: "6PWVauGLhBFHUJspsnBVZHr56ZnbvmhSD2gS7czBHGpE",
-        },
-        [tokens.INF]: {
-            bank: "AwLRW3aPMMftXEjgWhTkYwM9CGBHdtKecvahCJZBwAqY",
-            liquidityVault: "HQ1CGcqRshMhuonTGTnnmgw9ffcXxizGdZ6F6PKffWWi",
-            vaultAuthority: "AEZb1XH5bfLwqk3hBKDuLfWyJKdLTgDPCkgn64BJKcvV",
-        },
-        [tokens.H_SOL]: {
-            bank: "GJCi1uj3kYPZ64puA5sLUiCQfFapxT2xnREzrbDzFkYY",
-            liquidityVault: "8M97jkdr4rJtPnQ4yQ9stD6qVwaUvjrBdDPDbHJnPJLf",
-            vaultAuthority: "8x7mgTn5RvHR8Tn3CJqexSuQwrs6MLEy8csuXCDVvvpt",
-        },
-        [tokens.JUP_SOL]: {
-            bank: "8LaUZadNqtzuCG7iCvZd7d5cbquuYfv19KjAg6GPuuCb",
-            liquidityVault: "B1zjqKPoYp9bTMhzFADaAvjyGb49FMitLpi6P3Pa3YR6",
-            vaultAuthority: "93Qqsge2jHVsWLd8vas4cWghrsZJooMUr5JKN5DtcfMX",
-        },
-        [tokens.JUP]: {
-            bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
-            liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
-            vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
-        },
-        [tokens.JTO]: {
-            bank: "EdB7YADw4XUt6wErT8kHGCUok4mnTpWGzPUU9rWDebzb",
-            liquidityVault: "3bY1DEkXodGmPMG5f7ABA12228MBG5JdAAKf5cgkB6G1",
-            vaultAuthority: "H2b4f2fGSKFortxwzrMZBnYVfr2yrKVUakg4Md9be3Wv",
-        },
-        [tokens.JLP]: {
-            bank: "Amtw3n7GZe5SWmyhMhaFhDTi39zbTkLeWErBsmZXwpDa",
-            liquidityVault: "9xfyL8gxbV77VvhdgFmacHyLEG4h7d2eDWkSMfhXUPQ",
-            vaultAuthority: "F4RSGd4BRXscCqAVG3rFLiPVpo7v6j1drVqnvSM3rBKH",
-        },
-        [tokens.WBTC]: {
-            bank: "BKsfDJCMbYep6gr9pq8PsmJbb5XGLHbAJzUV8vmorz7a",
-            liquidityVault: "CMNdnjfaDQZo3VMoX31wZQBnSGu5FMmb1CnBaU4tApZk",
-            vaultAuthority: "7P2TQHYgVJkXv1VPaREsL5Pi1gnNjVif5aF3pJewZ9kj",
-        },
-        [tokens.WETH]: {
-            bank: "BkUyfXjbBBALcfZvw76WAFRvYQ21xxMWWeoPtJrUqG3z",
-            liquidityVault: "AxPJtiTEDksJWvCqNHCziK4uUcabqfmwW41dqtZrPFkp",
-            vaultAuthority: "ELXogWuyXrFyUG1vevffVbEhVxdFrHf2GCJTtRGKBWdM",
-        },
-        [tokens.HNT]: {
-            bank: "JBcir4DPRPYVUpks9hkS1jtHMXejfeBo4xJGv3AYYHg6",
-            liquidityVault: "E8Q7u5e9L9Uykx16em75ERT9wfbBPtkNL8gsRjoP8GB9",
-            vaultAuthority: "AjsyrYpgaH275DBSnvNWdGK33hVycSFuXN87FKnX6fVY",
-        },
-        [tokens.PYTH]: {
-            bank: "E4td8i8PT2BZkMygzW4MGHCv2KPPs57dvz5W2ZXf9Twu",
-            liquidityVault: "DUrAkkaMAckzes7so9T5frXm9YFFgjAAm3MMwHwTfVJq",
-            vaultAuthority: "9b5KdVnbbfEQ2qhLeFjWvcAx2VWe9XHx7ZgayZyL9a6C",
-        },
-        [tokens.USDC]: {
-            bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
-            liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
-            vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
-        },
-        [tokens.USDT]: {
-            bank: "HmpMfL8942u22htC4EMiWgLX931g3sacXFR6KjuLgKLV",
-            liquidityVault: "77t6Fi9qj4s4z22K1toufHtstM8rEy7Y3ytxik7mcsTy",
-            vaultAuthority: "9r6z6KgkEytHCdQWNxvDQH98PsfU98f1m5PCg47mY2XE",
-        },
-        [tokens.BONK]: {
-            bank: "DeyH7QxWvnbbaVB4zFrf4hoq7Q8z1ZT14co42BGwGtfM",
-            liquidityVault: "7FdQsXmCW3N5JQbknj3F9Yqq73er9VZJjGhEEMS8Ct2A",
-            vaultAuthority: "26kcZkdjJc94PdhqiLiEaGiLCYgAVVUfpDaZyK4cqih3",
-        },
-        [tokens.WIF]: {
-            bank: "9dpu8KL5ABYiD3WP2Cnajzg1XaotcJvZspv29Y1Y3tn1",
-            liquidityVault: "4kT3EXc5dDVndUU9mV6EH3Jh3CSEvpcCZjuMkwqrtxUy",
-            vaultAuthority: "9gNrvvZ9RuTyRWooiEEypwcXU6kyXW8yWuhXU8tWUH5L",
-        },
-    },
-    ["DQ2jqDJw9uzTwttf6h6r217BQ7kws3jZbJXDkfbCJa1q"]: {
-        [tokens.POPCAT]: {
-            bank: "845oEvt1oduoBj5zQxTr21cWWaUVnRjGerJuW3yMo2nn",
-            liquidityVault: "At6R64ip51zay4dT6k1WnVGETSMcaiY5vggD5DVTgxri",
-            vaultAuthority: "dNraDCWb5usDSoW4kD1Mi2E9WsNu6EABcQZqnrDfjNb",
-        },
-        [tokens.USDC]: {
-            bank: "EXrnNVfLagt3j4hCHSD9WqK75o6dkZBtjpnrSrSC78MA",
-            liquidityVault: "D9HSUYz3Rg2cTH65dUPaQS1MYxofNTeLecsAjiBgVPur",
-            vaultAuthority: "5ivKgJnxQ9CewJcKYSPQUiQFdfJki6YS87FqohnMSsFM",
-        },
-    },
-    ["EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"]: {
-        [tokens.RETARDIO]: {
-            bank: "3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM",
-            liquidityVault: "863K9YPVT3xbUGFZevrQJLqMux3UdRkwNQ6usAp4hJyy",
-            vaultAuthority: "Qsv2rnNRdv59AwRU3YmGPMCTdKT41CDAKyYAr4srCJR",
-        },
-        [tokens.USDC]: {
-            bank: "6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5",
-            liquidityVault: "7orVfNL5ZjqvdSaDgYLgBk4i5B3AnwFXNqqAvJbx6DFy",
-            vaultAuthority: "G4Azxk4PYtNRmDZkJppYo3rNAinkZXzYpQPG5dVDh4Nj",
-        },
-    },
-    ["G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"]: {
-        [tokens.BILLY]: {
-            bank: "Dj3PndQ3j1vuga5ApiFWWAfQ4h3wBtgS2SeLZBT2LD4g",
-            liquidityVault: "BRcRMDVPBQzXNXWtSS6bNotcGxhVsxfiAt1qf8nFVUpx",
-            vaultAuthority: "36SgFh1qBRyj1PEhsn7Kg9Sfwbrn7rHP7kvTM5o5n6AL",
-        },
-        [tokens.USDC]: {
-            bank: "A7vBgCowCYeja7GTc3pyqUBdC9Gkue2gWaMjGZW38meM",
-            liquidityVault: "DBGhZ8TJTG2Pacdva27zY9etaro24o1tTA3LToSjYHbx",
-            vaultAuthority: "Cg6BCqkGny7A2AXCV8rikhHXM82wqqfzmdsTobEeTQkH",
-        },
-    },
-    ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
-        [tokens.HMTR]: {
-            bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
-            liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
-            vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
-        },
-        [tokens.USDC]: {
-            bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
-            liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
-            vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
-        },
-    },
-};
-const MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
-const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE = "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";
-function getMarginfiAccounts(programEnv, marginfiGroup) {
-    if (programEnv === undefined) {
-        if (Boolean(marginfiGroup)) {
-            programEnv = Object.keys(MARGINFI_PROD_ACCOUNTS).includes(marginfiGroup.toString())
-                ? "Prod"
-                : "Staging";
-        }
-        else {
-            programEnv = "Prod";
-        }
-    }
-    if (programEnv === "Prod") {
-        return {
-            program: MARGINFI_PROD_PROGRAM,
-            defaultGroup: new web3_js_1.PublicKey(PROD_DEFAULT_MARGINFI_GROUP),
-            lookupTable: new web3_js_1.PublicKey(MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE),
-            bankAccounts: MARGINFI_PROD_ACCOUNTS,
-        };
-    }
-    else {
-        return {
-            program: MARGINFI_STAGING_PROGRAM,
-            defaultGroup: new web3_js_1.PublicKey(STAGING_DEFAULT_MARGINFI_GROUP),
-            lookupTable: new web3_js_1.PublicKey(MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE),
-            bankAccounts: MARGINFI_STAGING_ACCOUNTS,
-        };
-    }
-}
-function isMarginfiProgram(programId) {
-    return (programId.equals(MARGINFI_PROD_PROGRAM) ||
-        programId.equals(MARGINFI_STAGING_PROGRAM));
-}

package/dist/constants/pythConstants.d.ts

@@ -1,24 +0,0 @@
-import { PublicKey } from "@solana/web3.js";
-export declare const PYTH_PUSH_PROGRAM: PublicKey;
-export declare const PYTH_SPONSORED_SHARD_ID = 0;
-export declare const MARGINFI_SPONSORED_SHARD_ID = 3301;
-export declare const PYTH_PRICE_FEED_IDS: {
-    [x: string]: string;
-    bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1: string;
-    mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So: string;
-    J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn: string;
-    LSTxxxnJzKDFSLr4dUkPcmCf5VyryEqzPLz5j4bpxFp: string;
-    "5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm": string;
-    JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN: string;
-    jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL: string;
-    "27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4": string;
-    "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh": string;
-    "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs": string;
-    hntyVP6YFm1Hg25TN9WGLqM12b8TQmcknKrdu1oxWux: string;
-    HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3: string;
-    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: string;
-    Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB: string;
-    DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263: string;
-    EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm: string;
-};
-//# sourceMappingURL=pythConstants.d.ts.map

package/dist/constants/pythConstants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAE7B,CAAC;AAEF,eAAO,MAAM,uBAAuB,IAAI,CAAC;AACzC,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAGhD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;CAmC/B,CAAC"}

package/dist/constants/pythConstants.js

@@ -1,52 +0,0 @@
-"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.PYTH_PRICE_FEED_IDS = exports.MARGINFI_SPONSORED_SHARD_ID = exports.PYTH_SPONSORED_SHARD_ID = exports.PYTH_PUSH_PROGRAM = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const tokens = __importStar(require("./tokenConstants"));
-const web3_js_1 = require("@solana/web3.js");
-exports.PYTH_PUSH_PROGRAM = new web3_js_1.PublicKey("pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT");
-exports.PYTH_SPONSORED_SHARD_ID = 0;
-exports.MARGINFI_SPONSORED_SHARD_ID = 3301;
-// https://pyth.network/developers/price-feed-ids#solana-stable
-exports.PYTH_PRICE_FEED_IDS = {
-    [spl_token_1.NATIVE_MINT.toString()]: "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
-    [tokens.B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
-    [tokens.M_SOL]: "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
-    [tokens.JITO_SOL]: "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
-    [tokens.LST]: "0x12fb674ee496045b1d9cf7d5e65379acb026133c2ad69f3ed996fb9fe68e3a37",
-    [tokens.INF]: "0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f",
-    [tokens.JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
-    [tokens.JTO]: "0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2",
-    [tokens.JLP]: "0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a",
-    [tokens.WBTC]: "0xc9d8b075a5c69303365ae23633d4e085199bf5c520a3b90fed1322a0342ffc33",
-    [tokens.WETH]: "0x9d4294bbcd1174d6f2003ec365831e64cc31d9f6f15a2b85399db8d5000960f6",
-    [tokens.HNT]: "0x649fdd7ec08e8e2a20f425729854e90293dcbe2376abc47197a14da6ff339756",
-    [tokens.PYTH]: "0x0bbf28e9a841a1cc788f6a361b17ca072d0ea3098a1e5df1c3922d06719579ff",
-    [tokens.USDC]: "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-    [tokens.USDT]: "0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
-    [tokens.BONK]: "0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419",
-    [tokens.WIF]: "0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc",
-};