@haven-fi/solauto-sdk 1.0.623 → 1.0.625

package/src/utils/marginfiUtils.ts

@@ -1,16 +1,30 @@
 import { PublicKey } from "@solana/web3.js";
-import { publicKey, Umi } from "@metaplex-foundation/umi";
+import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { ProgramEnv, MarginfiAssetAccounts } from "../types";
+import { PositionState, PositionTokenState } from "../generated";
+import {
+  DEFAULT_MARGINFI_GROUP,
+  MARGINFI_ACCOUNTS,
+  ALL_SUPPORTED_TOKENS,
+  MARGINFI_PROD_PROGRAM,
+  MARGINFI_STAGING_PROGRAM,
+  TOKEN_INFO,
+  USD_DECIMALS,
+} from "../constants";
 import {
   Bank,
   deserializeMarginfiAccount,
   getMarginfiAccountSize,
-  MARGINFI_PROGRAM_ID,
+  getMarginfiErrorFromCode,
+  getMarginfiErrorFromName,
   MarginfiAccount,
   OracleSetup,
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
+import { ContextUpdates } from "./solautoUtils";
+import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
 import { currentUnixSeconds } from "./generalUtils";
 import {
   bytesToI80F48,
@@ -20,16 +34,44 @@ import {
   toBaseUnit,
   toBps,
 } from "./numberUtils";
-import {
-  DEFAULT_MARGINFI_GROUP,
-  MARGINFI_ACCOUNTS,
-} from "../constants/marginfiAccounts";
-import { MarginfiAssetAccounts } from "../types/accounts";
-import { PositionState, PositionTokenState } from "../generated";
-import { USD_DECIMALS } from "../constants/generalAccounts";
-import { ContextUpdates } from "./solautoUtils";
-import { ALL_SUPPORTED_TOKENS, TOKEN_INFO } from "../constants";
-import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
+
+export function getMarginfiProgram(env: ProgramEnv) {
+  return env === "Prod" ? MARGINFI_PROD_PROGRAM : MARGINFI_STAGING_PROGRAM;
+}
+
+export function isMarginfiProgram(programId: PublicKey) {
+  return (
+    programId.equals(MARGINFI_PROD_PROGRAM) ||
+    programId.equals(MARGINFI_STAGING_PROGRAM)
+  );
+}
+
+export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
+  return {
+    name: "marginfi",
+    publicKey: publicKey(getMarginfiProgram(env ?? "Prod")),
+    getErrorFromCode(code: number, cause?: Error) {
+      return getMarginfiErrorFromCode(code, this, cause);
+    },
+    getErrorFromName(name: string, cause?: Error) {
+      return getMarginfiErrorFromName(name, this, cause);
+    },
+    isOnCluster() {
+      return true;
+    },
+  };
+}
+
+export function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv) {
+  return umi.use({
+    install(umi) {
+      umi.programs.add(
+        createDynamicMarginfiProgram(marginfiEnv ?? "Prod"),
+        false
+      );
+    },
+  });
+}
 
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
   mint: PublicKey;
@@ -149,7 +191,7 @@ export async function getEmptyMarginfiAccountsByAuthority(
   authority: PublicKey
 ): Promise<MarginfiAccount[]> {
   const marginfiAccounts = await umi.rpc.getProgramAccounts(
-    MARGINFI_PROGRAM_ID,
+    umi.programs.get("marginfi").publicKey,
     {
       commitment: "confirmed",
       filters: [
@@ -187,7 +229,7 @@ export async function getAllMarginfiAccountsByAuthority(
   { marginfiAccount: PublicKey; supplyMint?: PublicKey; debtMint?: PublicKey }[]
 > {
   const marginfiAccounts = await umi.rpc.getProgramAccounts(
-    MARGINFI_PROGRAM_ID,
+    umi.programs.get("marginfi").publicKey,
     {
       commitment: "confirmed",
       dataSlice: {

package/src/utils/numberUtils.ts

@@ -1,6 +1,5 @@
 import { BASIS_POINTS, MIN_REPAY_GAP_BPS, USD_DECIMALS } from "../constants";
 import { PositionState } from "../generated";
-import { tokenInfo } from "./generalUtils";
 
 export function calcNetWorthUsd(state?: PositionState) {
   return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));

package/src/utils/priceUtils.ts

@@ -1,16 +1,18 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
-import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
-import { fromBaseUnit, toBaseUnit, toBps } from "./numberUtils";
-import { PRICES } from "../constants/solautoConstants";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
+import * as SwbCommon from "@switchboard-xyz/common";
+import {
+  PYTH_PRICE_FEED_IDS,
+  PRICES,
+  SWITCHBOARD_PRICE_FEED_IDS,
+} from "../constants";
+import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import {
   consoleLog,
   currentUnixSeconds,
   retryWithExponentialBackoff,
   zip,
 } from "./generalUtils";
-import * as SwbCommon from "@switchboard-xyz/common";
 import { getJupPriceData } from "./jupiterUtils";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {

package/src/utils/solanaUtils.ts

@@ -1,19 +1,4 @@
 import bs58 from "bs58";
-import {
-  AddressLookupTableInput,
-  Signer,
-  TransactionBuilder,
-  Umi,
-  WrappedInstruction,
-  publicKey,
-  transactionBuilder,
-} from "@metaplex-foundation/umi";
-import {
-  fromWeb3JsInstruction,
-  toWeb3JsPublicKey,
-  toWeb3JsTransaction,
-} from "@metaplex-foundation/umi-web3js-adapters";
-import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import {
   AddressLookupTableAccount,
   BlockhashWithExpiryBlockHeight,
@@ -32,6 +17,26 @@ import {
   createCloseAccountInstruction,
   createTransferInstruction,
 } from "@solana/spl-token";
+import {
+  AddressLookupTableInput,
+  Signer,
+  TransactionBuilder,
+  Umi,
+  WrappedInstruction,
+  publicKey,
+  transactionBuilder,
+} from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsInstruction,
+  toWeb3JsPublicKey,
+  toWeb3JsTransaction,
+} from "@metaplex-foundation/umi-web3js-adapters";
+import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
+import { PriorityFeeSetting, ProgramEnv, TransactionRunType } from "../types";
+import {
+  getLendingAccountEndFlashloanInstructionDataSerializer,
+  getLendingAccountStartFlashloanInstructionDataSerializer,
+} from "../marginfi-sdk";
 import { getTokenAccount } from "./accountUtils";
 import {
   arraysAreEqual,
@@ -39,34 +44,21 @@ import {
   customRpcCall,
   retryWithExponentialBackoff,
 } from "./generalUtils";
-import {
-  getLendingAccountEndFlashloanInstructionDataSerializer,
-  getLendingAccountStartFlashloanInstructionDataSerializer,
-} from "../marginfi-sdk";
-import { PriorityFeeSetting, TransactionRunType } from "../types";
-import { SOLAUTO_PROD_PROGRAM } from "../constants";
 import { createDynamicSolautoProgram } from "./solautoUtils";
-
-export function buildHeliusApiUrl(heliusApiKey: string) {
-  return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
-}
-
-export function buildIronforgeApiUrl(ironforgeApiKey: string) {
-  return `https://rpc.ironforge.network/mainnet?apiKey=${ironforgeApiKey}`;
-}
+import { createDynamicMarginfiProgram } from "./marginfiUtils";
 
 export function getSolanaRpcConnection(
   rpcUrl: string,
-  programId: PublicKey = SOLAUTO_PROD_PROGRAM,
-  wsEndpoint?: string
+  programId?: PublicKey,
+  lpEnv?: ProgramEnv
 ): [Connection, Umi] {
   const connection = new Connection(rpcUrl, {
     commitment: "confirmed",
-    wsEndpoint: wsEndpoint,
   });
   const umi = createUmi(connection).use({
     install(umi) {
       umi.programs.add(createDynamicSolautoProgram(programId), false);
+      umi.programs.add(createDynamicMarginfiProgram(lpEnv), false);
     },
   });
   return [connection, umi];

package/src/utils/solautoUtils.ts

@@ -1,5 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { QuoteResponse } from "@jup-ag/api";
 import {
   AutomationSettings,
   DCASettings,
@@ -17,21 +19,15 @@ import {
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
 } from "../generated";
-import { getReferralState } from "./accountUtils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { ALL_SUPPORTED_TOKENS } from "../constants";
-import {
-  findMarginfiAccounts,
-  getAllMarginfiAccountsByAuthority,
-} from "./marginfiUtils";
-import { SolautoPositionDetails } from "../types/solauto";
-import { QuoteResponse } from "@jup-ag/api";
-import { createSolautoSettings } from "../solautoPosition";
+import { ALL_SUPPORTED_TOKENS, SOLAUTO_PROD_PROGRAM } from "../constants";
+import { SolautoPositionDetails } from "../types";
 import {
   SolautoClient,
   SolautoMarginfiClient,
   TxHandlerProps,
 } from "../services";
+import { createSolautoSettings } from "../solautoPosition";
+import { getReferralState } from "./accountUtils";
 import {
   calcTotalDebt,
   calcTotalSupply,
@@ -41,11 +37,15 @@ import {
   toRoundedUsdValue,
 } from "./numberUtils";
 import { fetchTokenPrices } from "./priceUtils";
+import {
+  findMarginfiAccounts,
+  getAllMarginfiAccountsByAuthority,
+} from "./marginfiUtils";
 
-export function createDynamicSolautoProgram(programId: PublicKey): Program {
+export function createDynamicSolautoProgram(programId?: PublicKey): Program {
   return {
     name: "solauto",
-    publicKey: publicKey(programId),
+    publicKey: publicKey(programId ?? SOLAUTO_PROD_PROGRAM),
     getErrorFromCode(code: number, cause?: Error) {
       return getSolautoErrorFromCode(code, this, cause);
     },
@@ -471,4 +471,4 @@ export function hasLastRebalance(rebalanceType: SolautoRebalanceType) {
     SolautoRebalanceType.DoubleRebalanceWithFL,
     SolautoRebalanceType.FLSwapThenRebalance,
   ].includes(rebalanceType);
-}
+}

package/src/utils/stringUtils.ts

@@ -1,14 +1,14 @@
+import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { WBTC, WETH } from "../constants";
-import { PublicKey } from "@solana/web3.js";
 import { tokenInfo } from "./generalUtils";
 
 export const StrategyTypes = ["Long", "Short", "Ratio"] as const;
 export type StrategyType = (typeof StrategyTypes)[number];
 
 const MAJORS_PRIO = {
-  [WBTC.toString()]: 0,
-  [WETH.toString()]: 1,
+  [WBTC]: 0,
+  [WETH]: 1,
   [NATIVE_MINT.toString()]: 2,
 };
 

package/src/utils/switchboardUtils.ts

@@ -1,16 +1,16 @@
-import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
-import switchboardIdl from "../idls/switchboard.json";
 import {
   Connection,
   PublicKey,
   Transaction,
   VersionedTransaction,
 } from "@solana/web3.js";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
-import { TransactionItemInputs } from "../types";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
+import switchboardIdl from "../idls/switchboard.json";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
+import { TransactionItemInputs } from "../types";
 import { retryWithExponentialBackoff } from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";
 

package/tests/transactions/shared.ts

@@ -1,10 +1,12 @@
+import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
 import { Signer } from "@metaplex-foundation/umi";
 import {
-  buildIronforgeApiUrl,
   consoleLog,
   fetchTokenPrices,
   getClient,
   LendingPlatform,
+  LOCAL_IRONFORGE_API_URL,
   maxBoostToBps,
   maxRepayToBps,
   RebalanceTxBuilder,
@@ -17,8 +19,6 @@ import {
   TransactionsManager,
   USDC,
 } from "../../src";
-import { PublicKey } from "@solana/web3.js";
-import { NATIVE_MINT } from "@solana/spl-token";
 
 export async function e2eTransactionTest(
   signer: Signer,
@@ -28,7 +28,7 @@ export async function e2eTransactionTest(
 ) {
   const client = getClient(lendingPlatform, {
     signer,
-    rpcUrl: buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    rpcUrl: LOCAL_IRONFORGE_API_URL,
     programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
   });
 
@@ -72,7 +72,10 @@ export async function e2eTransactionTest(
       return {
         tx: client.protocolInteractionIx(
           solautoAction("Deposit", [
-            toBaseUnit(supplyUsd / supplyPrice, client.pos.supplyMintInfo().decimals),
+            toBaseUnit(
+              supplyUsd / supplyPrice,
+              client.pos.supplyMintInfo().decimals
+            ),
           ])
         ),
       };
@@ -120,15 +123,7 @@ export async function e2eTransactionTest(
     )
   );
 
-  const txManager = new TransactionsManager(
-    client,
-    undefined,
-    "only-simulate",
-    undefined,
-    true,
-    undefined,
-    { totalRetries: 5 }
-  );
+  const txManager = new TransactionsManager(client, undefined, "only-simulate");
   const statuses = await txManager.clientSend(transactionItems);
 
   consoleLog(statuses);

package/tests/transactions/solautoMarginfi.ts

@@ -1,6 +1,6 @@
 import { describe, it } from "mocha";
-import { setupTest } from "../shared";
 import { LendingPlatform } from "../../src";
+import { setupTest } from "../shared";
 import { e2eTransactionTest } from "./shared";
 
 describe("Solauto Marginfi tests", async () => {
@@ -8,10 +8,20 @@ describe("Solauto Marginfi tests", async () => {
   const testProgram = true;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
-    await e2eTransactionTest(signer, testProgram, LendingPlatform.Marginfi, false);
+    await e2eTransactionTest(
+      signer,
+      testProgram,
+      LendingPlatform.Marginfi,
+      false
+    );
   });
 
   it("open - deposit - borrow - fl rebalance to 0 - withdraw - close", async () => {
-    await e2eTransactionTest(signer, testProgram, LendingPlatform.Marginfi, true);
+    await e2eTransactionTest(
+      signer,
+      testProgram,
+      LendingPlatform.Marginfi,
+      true
+    );
   });
 });

package/tests/unit/accounts.ts

@@ -1,29 +1,25 @@
 import { describe, it } from "mocha";
+import { assert } from "chai";
+import { PublicKey } from "@solana/web3.js";
+import { publicKey } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ALL_SUPPORTED_TOKENS,
   TOKEN_INFO,
-} from "../../src/constants/tokenConstants";
+  MARGINFI_ACCOUNTS,
+  SOLAUTO_FEES_WALLET,
+  SOLAUTO_MANAGER,
+  LOCAL_IRONFORGE_API_URL,
+} from "../../src/constants";
 import {
-  buildHeliusApiUrl,
   getSolanaRpcConnection,
-} from "../../src/utils/solanaUtils";
-import { publicKey } from "@metaplex-foundation/umi";
-import { assert } from "chai";
-import {
   getEmptyMarginfiAccountsByAuthority,
   getTokenAccount,
 } from "../../src/utils";
-import {
-  MARGINFI_ACCOUNTS,
-  SOLAUTO_FEES_WALLET,
-  SOLAUTO_MANAGER,
-} from "../../src/constants";
-import { PublicKey } from "@solana/web3.js";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 async function hasTokenAccounts(wallet: PublicKey) {
   let [_, umi] = getSolanaRpcConnection(
-    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+    LOCAL_IRONFORGE_API_URL
   );
 
   const tokenAccounts = await umi.rpc.getAccounts(
@@ -50,18 +46,19 @@ describe("Assert Solauto fee token accounts are created", async () => {
 
   it("ISM accounts for every supported Marginfi group", async () => {
     let [_, umi] = getSolanaRpcConnection(
-      buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+      LOCAL_IRONFORGE_API_URL
     );
 
     const ismAccounts = await getEmptyMarginfiAccountsByAuthority(
       umi,
-      SOLAUTO_MANAGER,
+      SOLAUTO_MANAGER
     );
     const supportedMarginfiGroups = Object.keys(MARGINFI_ACCOUNTS).map(
       (x) => new PublicKey(x)
     );
     const missingIsmAccounts = supportedMarginfiGroups.filter(
-      (group) => !ismAccounts.find((x) => group.equals(toWeb3JsPublicKey(x.group)))
+      (group) =>
+        !ismAccounts.find((x) => group.equals(toWeb3JsPublicKey(x.group)))
     );
 
     console.log("Missing ISM accounts", missingIsmAccounts);

package/tests/unit/lookupTables.ts

@@ -1,18 +1,18 @@
 import { describe, it } from "mocha";
 import { PublicKey } from "@solana/web3.js";
 import {
+  LOCAL_IRONFORGE_API_URL,
   MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
-} from "../../src/constants/marginfiAccounts";
+  SOLAUTO_MANAGER,
+} from "../../src/constants";
 import {
-  buildIronforgeApiUrl,
   getEmptyMarginfiAccountsByAuthority,
   getSolanaRpcConnection,
-  SOLAUTO_MANAGER,
-} from "../../src";
+} from "../../src/utils";
 
 const [conn, umi] = getSolanaRpcConnection(
-  buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!)
+  LOCAL_IRONFORGE_API_URL
 );
 
 describe("Assert lookup tables up-to-date", async () => {

package/tests/unit/rebalanceCalculations.ts

@@ -1,24 +1,30 @@
 import { describe, it, before } from "mocha";
+import { assert } from "chai";
 import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
-import { assert } from "chai";
-import { setupTest } from "../shared";
 import { publicKey } from "@metaplex-foundation/umi";
+import { setupTest } from "../shared";
 import {
   LendingPlatform,
   SolautoSettingsParameters,
 } from "../../src/generated";
-import { fromBps, getLiqUtilzationRateBps } from "../../src/utils/numberUtils";
-import { getClient } from "../../src/utils/solautoUtils";
-import { USDC } from "../../src/constants/tokenConstants";
-import { buildIronforgeApiUrl, fetchTokenPrices, safeGetPrice } from "../../src/utils";
 import {
-  createFakePositionState,
+  fromBps,
+  getLiqUtilzationRateBps,
+  getClient,
+  fetchTokenPrices,
+  safeGetPrice,
+} from "../../src/utils";
+import { LOCAL_IRONFORGE_API_URL, USDC } from "../../src/constants";
+import {
   getRebalanceValues,
-  MarginfiSolautoPositionEx,
   SolautoClient,
-} from "../../src";
-import { SolautoFeesBps } from "../../src/services/rebalance/solautoFees";
+  SolautoFeesBps,
+} from "../../src/services";
+import {
+  createFakePositionState,
+  MarginfiSolautoPositionEx,
+} from "../../src/solautoPosition";
 
 const signer = setupTest(undefined, true);
 
@@ -58,7 +64,7 @@ async function getFakePosition(
 ): Promise<SolautoClient> {
   const client = getClient(LendingPlatform.Marginfi, {
     signer,
-    rpcUrl: buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    rpcUrl: LOCAL_IRONFORGE_API_URL,
   });
   await client.initialize({
     positionId: 1,

package/README.md

@@ -1,3 +0,0 @@
-# Solauto SDK
-
-TODO

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

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

package/src/constants/README.md

@@ -1,7 +0,0 @@
-Instructions for supporting new token:
-
-- add public key to tokenConstants.ts
-- add price feed in pythConstants.ts for it
-- create ATA for solauto fees wallet
-- `pnpm update-solauto-lut`
-- `pnpm test:ts:unit`