@haven-fi/solauto-sdk 1.0.624 → 1.0.626

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAEtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAIjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}

package/dist/utils/switchboardUtils.js

@@ -29,13 +29,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
 exports.getSwitchboardFeedData = getSwitchboardFeedData;
-const anchor_1 = require("@coral-xyz/anchor");
-const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
 const web3_js_1 = require("@solana/web3.js");
-const switchboardConstants_1 = require("../constants/switchboardConstants");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const anchor_1 = require("@coral-xyz/anchor");
 const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
+const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
+const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
 function getPullFeed(conn, mint, wallet) {
@@ -47,7 +47,7 @@ function getPullFeed(conn, mint, wallet) {
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
     const program = new anchor_1.Program(switchboard_json_1.default, provider);
     const { PullFeed } = OnDemand;
-    return new PullFeed(program, new web3_js_1.PublicKey(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
+    return new PullFeed(program, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
     const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));

package/local/createISMAccounts.ts

@@ -5,18 +5,24 @@ import {
   transactionBuilder,
 } from "@metaplex-foundation/umi";
 import {
-  buildHeliusApiUrl,
   getSolanaRpcConnection,
   sendSingleOptimizedTransaction,
-} from "../src/utils/solanaUtils";
-import { marginfiAccountInitialize, safeFetchAllMarginfiAccount } from "../src/marginfi-sdk";
-import { MARGINFI_ACCOUNTS, SOLAUTO_MANAGER } from "../src/constants";
-import { getSecretKey } from "./shared";
+  getAllMarginfiAccountsByAuthority,
+} from "../src/utils";
+import {
+  marginfiAccountInitialize,
+  safeFetchAllMarginfiAccount,
+} from "../src/marginfi-sdk";
+import {
+  LOCAL_IRONFORGE_API_URL,
+  MARGINFI_ACCOUNTS,
+  SOLAUTO_MANAGER,
+} from "../src/constants";
 import { updateSolautoLut } from "./updateSolautoLUT";
-import { getAllMarginfiAccountsByAuthority } from "../src/utils";
+import { getSecretKey } from "./shared";
 
 async function createIntermediarySolautoManagerAccounts() {
-  let [connection, umi] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY!));
+  let [connection, umi] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
 
   const secretKey = getSecretKey("solauto-manager");
   const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
@@ -24,13 +30,24 @@ async function createIntermediarySolautoManagerAccounts() {
 
   umi = umi.use(signerIdentity(signer));
 
-  const accounts = await getAllMarginfiAccountsByAuthority(umi, SOLAUTO_MANAGER, undefined, false);
-  const data = await safeFetchAllMarginfiAccount(umi, accounts.map(x => publicKey(x.marginfiAccount)));
-  const existingMarginfiGroups = data.map(x => x.group.toString());
+  const accounts = await getAllMarginfiAccountsByAuthority(
+    umi,
+    SOLAUTO_MANAGER,
+    undefined,
+    false
+  );
+  const data = await safeFetchAllMarginfiAccount(
+    umi,
+    accounts.map((x) => publicKey(x.marginfiAccount))
+  );
+  const existingMarginfiGroups = data.map((x) => x.group.toString());
 
   for (const group of Object.keys(MARGINFI_ACCOUNTS)) {
     if (existingMarginfiGroups.includes(group.toString())) {
-      console.log("Already have Solauto Manager Marginfi Account for group:", group);
+      console.log(
+        "Already have Solauto Manager Marginfi Account for group:",
+        group
+      );
       continue;
     }
 
@@ -45,7 +62,7 @@ async function createIntermediarySolautoManagerAccounts() {
       authority: signer,
       feePayer: signer,
     });
-  
+
     await sendSingleOptimizedTransaction(
       umi,
       connection,

package/local/createTokenAccounts.ts

@@ -1,7 +1,16 @@
 import { PublicKey } from "@solana/web3.js";
-import { ALL_SUPPORTED_TOKENS, SOLAUTO_FEES_WALLET } from "../src/constants";
 import {
-  buildHeliusApiUrl,
+  createSignerFromKeypair,
+  publicKey,
+  signerIdentity,
+  transactionBuilder,
+} from "@metaplex-foundation/umi";
+import {
+  ALL_SUPPORTED_TOKENS,
+  LOCAL_IRONFORGE_API_URL,
+  SOLAUTO_FEES_WALLET,
+} from "../src/constants";
+import {
   createAssociatedTokenAccountUmiIx,
   getSolanaRpcConnection,
   getTokenAccount,
@@ -9,17 +18,9 @@ import {
   zip,
 } from "../src/utils";
 import { getSecretKey } from "./shared";
-import {
-  createSignerFromKeypair,
-  publicKey,
-  signerIdentity,
-  transactionBuilder,
-} from "@metaplex-foundation/umi";
 
 async function createTokenAccounts(wallet: PublicKey) {
-  let [connection, umi] = getSolanaRpcConnection(
-    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
-  );
+  let [connection, umi] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
 
   const secretKey = getSecretKey();
   const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);

package/local/logPositions.ts

@@ -1,15 +1,15 @@
+import { PublicKey } from "@solana/web3.js";
+import path from "path";
+import { config } from "dotenv";
 import {
-  buildIronforgeApiUrl,
   fetchTokenPrices,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  LOCAL_IRONFORGE_API_URL,
   safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
 } from "../src";
-import { PublicKey } from "@solana/web3.js";
-import path from "path";
-import { config } from "dotenv";
 
 config({ path: path.join(__dirname, ".env") });
 
@@ -78,7 +78,7 @@ export function formatNumber(
 
 async function main(filterWhitelist: boolean) {
   const [_, umi] = getSolanaRpcConnection(
-    buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    LOCAL_IRONFORGE_API_URL,
     SOLAUTO_PROD_PROGRAM
   );
 

package/local/shared.ts

@@ -9,10 +9,10 @@ import {
   PublicKey,
 } from "@solana/web3.js";
 import {
-  buildHeliusApiUrl,
   getSolanaRpcConnection,
-} from "../src/utils/solanaUtils";
-import { getBatches } from "../src";
+  getBatches,
+  buildIronforgeApiUrl,
+} from "../src";
 
 function loadSecretKey(keypairPath: string) {
   const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
@@ -27,7 +27,7 @@ export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
 
 const keypair = Keypair.fromSecretKey(getSecretKey("solauto-fees"));
 const [connection, _] = getSolanaRpcConnection(
-  buildHeliusApiUrl(process.env.HELIUS_API_KEY ?? "")
+  buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY ?? "")
 );
 
 export async function createAndSendV0Tx(
@@ -89,14 +89,21 @@ async function addAddressesIfNeeded(
   }
 }
 
+const CACHE: { [key: string]: string[] } = {};
+
 export async function updateLookupTable(
   accounts: string[],
   lookupTableAddress?: PublicKey
 ) {
-  let lookupTable = lookupTableAddress
-    ? await connection.getAddressLookupTable(lookupTableAddress)
-    : null;
-  if (lookupTable === null) {
+  if (lookupTableAddress && !(lookupTableAddress.toString() in CACHE)) {
+    const lookupTable =
+      await connection.getAddressLookupTable(lookupTableAddress);
+    CACHE[lookupTableAddress.toString()] = (
+      lookupTable?.value?.state?.addresses ?? []
+    ).map((x) => x.toString());
+  }
+
+  if (!lookupTableAddress) {
     const [createLutIx, addr] = AddressLookupTableProgram.createLookupTable({
       authority: keypair.publicKey,
       payer: keypair.publicKey,
@@ -107,8 +114,7 @@ export async function updateLookupTable(
     await createAndSendV0Tx([createLutIx], keypair);
   }
 
-  const existingAccounts =
-    lookupTable?.value?.state.addresses.map((x) => x.toString()) ?? [];
+  const existingAccounts = CACHE[lookupTableAddress.toString()];
   console.log("Existing accounts: ", existingAccounts.length);
 
   await addAddressesIfNeeded(lookupTableAddress!, existingAccounts, accounts);

package/local/txSandbox.ts

@@ -1,10 +1,12 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
+import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  buildIronforgeApiUrl,
   consoleLog,
   getClient,
   getSolanaRpcConnection,
   LendingPlatform,
+  LOCAL_IRONFORGE_API_URL,
   PriorityFeeSetting,
   RebalanceTxBuilder,
   SOLAUTO_PROD_PROGRAM,
@@ -13,15 +15,13 @@ import {
   TransactionsManager,
 } from "../src";
 import { getSecretKey } from "./shared";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
-import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 
 const payForTransaction = false;
 const testProgram = true;
 
 export async function main() {
   const [, umi] = getSolanaRpcConnection(
-    buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    LOCAL_IRONFORGE_API_URL,
     testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
   );
 
@@ -33,7 +33,7 @@ export async function main() {
   const client = getClient(LendingPlatform.Marginfi, {
     signer,
     showLogs: true,
-    rpcUrl: buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    rpcUrl: LOCAL_IRONFORGE_API_URL,
     programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
   });
 

package/local/updateMarginfiLUT.ts

@@ -1,20 +1,4 @@
-import { Keypair, PublicKey } from "@solana/web3.js";
-import { MARGINFI_ACCOUNTS_LOOKUP_TABLE } from "../src/constants/marginfiAccounts";
-import {
-  MARGINFI_ACCOUNTS,
-  DEFAULT_MARGINFI_GROUP,
-} from "../src/constants/marginfiAccounts";
-import {
-  MARGINFI_PROGRAM_ID,
-  marginfiAccountInitialize,
-} from "../src/marginfi-sdk";
-import { createAndSendV0Tx, getSecretKey, updateLookupTable } from "./shared";
-import {
-  buildIronforgeApiUrl,
-  getEmptyMarginfiAccountsByAuthority,
-  getSolanaRpcConnection,
-  SOLAUTO_MANAGER,
-} from "../src";
+import { Keypair } from "@solana/web3.js";
 import {
   createSignerFromKeypair,
   publicKey,
@@ -25,11 +9,20 @@ import {
   toWeb3JsInstruction,
   toWeb3JsKeypair,
 } from "@metaplex-foundation/umi-web3js-adapters";
+import {
+  getEmptyMarginfiAccountsByAuthority,
+  getSolanaRpcConnection,
+  SOLAUTO_MANAGER,
+  marginfiAccountInitialize,
+  LOCAL_IRONFORGE_API_URL,
+  getMarginfiAccounts,
+} from "../src";
+import { createAndSendV0Tx, getSecretKey, updateLookupTable } from "./shared";
 
-const LOOKUP_TABLE_ADDRESS = new PublicKey(MARGINFI_ACCOUNTS_LOOKUP_TABLE);
-let [, umi] = getSolanaRpcConnection(
-  buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!)
-);
+const mfiAccounts = getMarginfiAccounts("Prod");
+
+const LOOKUP_TABLE_ADDRESS = mfiAccounts.lookupTable;
+let [, umi] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
 umi = umi.use(
   signerIdentity(
     createSignerFromKeypair(umi, umi.eddsa.generateKeypair()),
@@ -45,9 +38,9 @@ const solautoManager = createSignerFromKeypair(
 );
 
 async function addBanks() {
-  for (const group in MARGINFI_ACCOUNTS) {
-    for (const key in MARGINFI_ACCOUNTS[group]) {
-      const accounts = MARGINFI_ACCOUNTS[group][key];
+  for (const group in mfiAccounts.bankAccounts) {
+    for (const key in mfiAccounts.bankAccounts[group]) {
+      const accounts = mfiAccounts.bankAccounts[group][key];
       await updateLookupTable(
         [
           group,
@@ -68,45 +61,43 @@ async function addImfiAccounts() {
     SOLAUTO_MANAGER
   );
 
-  for (const group in MARGINFI_ACCOUNTS) {
+  const iMfiAccountsPerGrp = 2;
+  for (const group in mfiAccounts.bankAccounts) {
     const emptyAccs = imfiAccounts.filter((x) => x.group.toString() === group);
-    if (emptyAccs.length > 0) {
+    if (emptyAccs.length >= iMfiAccountsPerGrp) {
       await updateLookupTable(
         emptyAccs.map((x) => x.publicKey.toString()),
         LOOKUP_TABLE_ADDRESS
       );
     } else {
-      console.log("Creating Imfi account for group:", group);
-      const iMfiAccountKeypair = umi.eddsa.generateKeypair();
-      const iMfiAccount = createSignerFromKeypair(umi, iMfiAccountKeypair);
-      const umiIx = marginfiAccountInitialize(umi, {
-        marginfiAccount: iMfiAccount,
-        marginfiGroup: publicKey(group),
-        authority: solautoManager,
-        feePayer: solautoManager,
-      });
-      const ix = toWeb3JsInstruction(umiIx.getInstructions()[0]);
-      await createAndSendV0Tx([ix], solautoManagerKeypair, [
-        toWeb3JsKeypair(iMfiAccountKeypair),
-      ]);
-      await updateLookupTable(
-        [iMfiAccount.publicKey.toString()],
-        LOOKUP_TABLE_ADDRESS
-      );
+      for (let i = 0; i < iMfiAccountsPerGrp - emptyAccs.length; i++) {
+        console.log("Creating Imfi account for group:", group);
+        const iMfiAccountKeypair = umi.eddsa.generateKeypair();
+        const iMfiAccount = createSignerFromKeypair(umi, iMfiAccountKeypair);
+        const umiIx = marginfiAccountInitialize(umi, {
+          marginfiAccount: iMfiAccount,
+          marginfiGroup: publicKey(group),
+          authority: solautoManager,
+          feePayer: solautoManager,
+        });
+        const ix = toWeb3JsInstruction(umiIx.getInstructions()[0]);
+        await createAndSendV0Tx([ix], solautoManagerKeypair, [
+          toWeb3JsKeypair(iMfiAccountKeypair),
+        ]);
+        await updateLookupTable(
+          [iMfiAccount.publicKey.toString()],
+          LOOKUP_TABLE_ADDRESS
+        );
+      }
     }
   }
 }
 
 updateLookupTable(
-  [DEFAULT_MARGINFI_GROUP, MARGINFI_PROGRAM_ID],
+  [mfiAccounts.defaultGroup.toString(), mfiAccounts.program.toString()],
   LOOKUP_TABLE_ADDRESS
 );
 
 addBanks().then((x) => x);
 
 addImfiAccounts().then((x) => x);
-
-// TODO: get rid of these lookup tables
-// EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7
-// AuoepJfrCrkQF2PeUAgpnnJybRoiff82cNdwXTqyjjvm
-// Bno3JybASPc1jNBZ9rnrdKVvbhk6UNMvSsYvgtitq3zb

package/local/updateSolautoLUT.ts

@@ -1,23 +1,21 @@
 import { PublicKey } from "@solana/web3.js";
-import { getTokenAccounts } from "../src/utils/accountUtils";
 import {
   SOLAUTO_FEES_WALLET,
   SOLAUTO_MANAGER,
-} from "../src/constants/generalAccounts";
-import { ALL_SUPPORTED_TOKENS } from "../src/constants/tokenConstants";
-import { updateLookupTable } from "./shared";
-import {
   SOLAUTO_LUT,
   STANDARD_LUT_ACCOUNTS,
-} from "../src/constants/solautoConstants";
-import {
-  buildHeliusApiUrl,
+  SWITCHBOARD_PRICE_FEED_IDS,
+  ALL_SUPPORTED_TOKENS,
   getAllMarginfiAccountsByAuthority,
   getSolanaRpcConnection,
-} from "../src/utils";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../src/constants/switchboardConstants";
+  getTokenAccounts,
+  LOCAL_IRONFORGE_API_URL,
+} from "../src";
+import { updateLookupTable } from "./shared";
 
-const LOOKUP_TABLE_ADDRESS = Boolean(SOLAUTO_LUT) ? new PublicKey(SOLAUTO_LUT) : undefined;
+const LOOKUP_TABLE_ADDRESS = Boolean(SOLAUTO_LUT)
+  ? new PublicKey(SOLAUTO_LUT)
+  : undefined;
 const solautoManagerTokenAccounts = getTokenAccounts(
   SOLAUTO_MANAGER,
   ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x))
@@ -29,7 +27,7 @@ const solautoFeeWalletTokenAccounts = getTokenAccounts(
 
 export async function updateSolautoLut(additionalAccounts?: string[]) {
   const [_, umi] = getSolanaRpcConnection(
-    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+    LOCAL_IRONFORGE_API_URL
   );
   const ismAccounts = await getAllMarginfiAccountsByAuthority(
     umi,
@@ -43,7 +41,7 @@ export async function updateSolautoLut(additionalAccounts?: string[]) {
       ...solautoManagerTokenAccounts.map((x) => x.toString()),
       ...solautoFeeWalletTokenAccounts.map((x) => x.toString()),
       ...ismAccounts.map((x) => x.marginfiAccount.toString()),
-      ...Object.values(SWITCHBOARD_PRICE_FEED_IDS).map(x => x.feedId),
+      ...Object.values(SWITCHBOARD_PRICE_FEED_IDS).map((x) => x.feedId),
       ...(additionalAccounts ?? []),
     ],
     LOOKUP_TABLE_ADDRESS

package/package.json

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

package/src/constants/{generalAccounts.ts → generalConstants.ts}

@@ -1,5 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
+import { buildIronforgeApiUrl } from "../utils";
 
 export const USD_DECIMALS = 9;
 export const SOLAUTO_FEES_WALLET = new PublicKey("AprYCPiVeKMCgjQ2ZufwChMzvQ5kFjJo2ekTLSkXsQDm");
-export const SOLAUTO_MANAGER = new PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJVGxuJXhHCY");
+export const SOLAUTO_MANAGER = new PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJVGxuJXhHCY");
+
+export const LOCAL_IRONFORGE_API_URL = buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!);
+
+export const BASIS_POINTS = 10000;

package/src/constants/index.ts

@@ -1,5 +1,6 @@
-export * from './generalAccounts';
-export * from './marginfiAccounts';
-export * from './pythConstants';
-export * from './solautoConstants';
-export * from './tokenConstants';
+export * from "./generalConstants";
+export * from "./marginfiAccounts";
+export * from "./pythConstants";
+export * from "./solautoConstants";
+export * from "./switchboardConstants";
+export * from "./tokenConstants";

package/src/constants/marginfiAccounts.ts

@@ -1,20 +1,54 @@
+import { PublicKey } from "@solana/web3.js";
 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";
+import { ProgramEnv } from "../types";
 
-export const DEFAULT_MARGINFI_GROUP =
+export const MARGINFI_PROD_PROGRAM = new PublicKey(
+  "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
+);
+export const MARGINFI_STAGING_PROGRAM = new PublicKey(
+  "stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct"
+);
+
+const PROD_DEFAULT_MARGINFI_GROUP =
   "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
-export const DEFAULT_PUBKEY = PublicKey.default.toString();
+const STAGING_DEFAULT_MARGINFI_GROUP =
+  "FCPfpHA69EbS8f9KKSreTRkXbzFpunsKuYf5qNmnJjpo";
 
 const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
 
-export const MARGINFI_ACCOUNTS: {
+export type MarginfiAccountsMap = {
   [group: string]: { [token: string]: MarginfiAssetAccounts };
-} = {
-  [DEFAULT_MARGINFI_GROUP.toString()]: {
+};
+
+const MARGINFI_STAGING_ACCOUNTS: MarginfiAccountsMap = {
+  [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 = {
+  [PROD_DEFAULT_MARGINFI_GROUP.toString()]: {
     [NATIVE_MINT.toString()]: {
       bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
       liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
@@ -149,7 +183,8 @@ export const MARGINFI_ACCOUNTS: {
       bank: "3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM",
       liquidityVault: "863K9YPVT3xbUGFZevrQJLqMux3UdRkwNQ6usAp4hJyy",
       vaultAuthority: "Qsv2rnNRdv59AwRU3YmGPMCTdKT41CDAKyYAr4srCJR",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.RETARDIO.toString()].feedId,
+      priceOracle:
+        SWITCHBOARD_PRICE_FEED_IDS[tokens.RETARDIO.toString()].feedId,
     },
     [tokens.USDC]: {
       bank: "6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5",
@@ -184,9 +219,52 @@ export const MARGINFI_ACCOUNTS: {
       liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
       vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
       priceOracle: USDC_PRICE_ORACLE,
-    }
-  }
+    },
+  },
 };
 
-export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =
+const MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE =
   "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
+
+const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE =
+  "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";
+
+export interface MarginfiProgramAccounts {
+  program: PublicKey;
+  defaultGroup: PublicKey;
+  lookupTable: PublicKey;
+  bankAccounts: MarginfiAccountsMap;
+}
+
+export function getMarginfiAccounts(
+  programEnv?: ProgramEnv,
+  marginfiGroup?: PublicKey
+): MarginfiProgramAccounts {
+  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 PublicKey(PROD_DEFAULT_MARGINFI_GROUP),
+      lookupTable: new PublicKey(MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE),
+      bankAccounts: MARGINFI_PROD_ACCOUNTS,
+    };
+  } else {
+    return {
+      program: MARGINFI_STAGING_PROGRAM,
+      defaultGroup: new PublicKey(STAGING_DEFAULT_MARGINFI_GROUP),
+      lookupTable: new PublicKey(MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE),
+      bankAccounts: MARGINFI_STAGING_ACCOUNTS,
+    };
+  }
+}

package/src/constants/solautoConstants.ts

@@ -9,9 +9,8 @@ import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
-import { SOLAUTO_MANAGER } from "./generalAccounts";
+import { SOLAUTO_MANAGER } from "./generalConstants";
 import { JUPITER_PROGRAM_ID } from "../jupiter-sdk";
-import { HNT, JLP, JTO, JUP, PYTH, WETH } from "./tokenConstants";
 
 export const SOLAUTO_PROD_PROGRAM = new PublicKey(
   "AutoyKBRaHSBHy9RsmXCZMy6nNFAg5FYijrvZyQcNLV"
@@ -22,8 +21,6 @@ export const SOLAUTO_TEST_PROGRAM = new PublicKey(
 
 (globalThis as any).SHOW_LOGS = false;
 
-export const BASIS_POINTS = 10000;
-
 export const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
 export const MIN_REPAY_GAP_BPS = 50;
 export const MIN_BOOST_GAP_BPS = 50;
@@ -33,8 +30,6 @@ export const REFERRER_PERCENTAGE = 0.15;
 
 export const PRICES: { [key: string]: { price: number; time: number } } = {};
 
-export const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
-
 export const JITO_TIP_ACCOUNTS = [
   "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
   "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",
@@ -59,7 +54,4 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_RENT_PUBKEY,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   JUPITER_PROGRAM_ID,
-].map((x) => x.toString());
-
-// TODO:
-export const BROKEN_TOKENS = [JUP, JLP, WETH, HNT, JTO, PYTH];
+].map((x) => x.toString());