@haven-fi/solauto-sdk 1.0.623 → 1.0.625

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 {
   createSignerFromKeypair,
   publicKey,
@@ -25,10 +9,22 @@ import {
   toWeb3JsInstruction,
   toWeb3JsKeypair,
 } from "@metaplex-foundation/umi-web3js-adapters";
+import {
+  MARGINFI_ACCOUNTS_LOOKUP_TABLE,
+  MARGINFI_ACCOUNTS,
+  DEFAULT_MARGINFI_GROUP,
+  getEmptyMarginfiAccountsByAuthority,
+  getSolanaRpcConnection,
+  SOLAUTO_MANAGER,
+  marginfiAccountInitialize,
+  LOCAL_IRONFORGE_API_URL,
+  MARGINFI_PROD_PROGRAM,
+} 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!)
+  LOCAL_IRONFORGE_API_URL
 );
 umi = umi.use(
   signerIdentity(
@@ -68,45 +64,43 @@ async function addImfiAccounts() {
     SOLAUTO_MANAGER
   );
 
+  const iMfiAccountsPerGrp = 2;
   for (const group in MARGINFI_ACCOUNTS) {
     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],
+  [DEFAULT_MARGINFI_GROUP, MARGINFI_PROD_PROGRAM.toString()], // TODO
   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.623",
+  "version": "1.0.625",
   "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,14 +1,19 @@
+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";
 
+export const MARGINFI_PROD_PROGRAM = new PublicKey(
+  "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
+);
+export const MARGINFI_STAGING_PROGRAM = new PublicKey(
+  "stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct"
+);
+
 export const DEFAULT_MARGINFI_GROUP =
   "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
-export const DEFAULT_PUBKEY = PublicKey.default.toString();
-
 const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
 
 export const MARGINFI_ACCOUNTS: {
@@ -149,7 +154,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 +190,12 @@ export const MARGINFI_ACCOUNTS: {
       liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
       vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
       priceOracle: USDC_PRICE_ORACLE,
-    }
-  }
+    },
+  },
 };
 
 export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =
   "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
+
+export const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE =
+  "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";

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());

package/src/services/flashLoans/flProviderAggregator.ts

@@ -1,10 +1,10 @@
-import { FlProviderBase } from "./flProviderBase";
 import { PublicKey } from "@solana/web3.js";
-import { FlashLoanDetails, FlashLoanRequirements } from "../../types";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { FlProviderBase } from "./flProviderBase";
+import { FlashLoanDetails, ProgramEnv } from "../../types";
 import { TokenType } from "../../generated";
 import { MarginfiFlProvider } from "./marginfiFlProvider";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export class FlProviderAggregator extends FlProviderBase {
   private marginfiFlProvider!: MarginfiFlProvider;
@@ -14,15 +14,17 @@ export class FlProviderAggregator extends FlProviderBase {
     signer: Signer,
     authority: PublicKey,
     supplyMint: PublicKey,
-    debtMint: PublicKey
+    debtMint: PublicKey,
+    programEnv?: ProgramEnv
   ) {
-    super(umi, signer, authority, supplyMint, debtMint);
+    super(umi, signer, authority, supplyMint, debtMint, programEnv);
     this.marginfiFlProvider = new MarginfiFlProvider(
       umi,
       signer,
       authority,
       supplyMint,
-      debtMint
+      debtMint,
+      programEnv
     );
   }
 
@@ -60,7 +62,7 @@ export class FlProviderAggregator extends FlProviderBase {
   }
 
   flFeeBps(source: TokenType, signerFlashLoan?: boolean): number {
-    return this.flProvider(source).flFeeBps(source);
+    return this.flProvider(source).flFeeBps(source, signerFlashLoan);
   }
 
   flashBorrow(

package/src/services/flashLoans/flProviderBase.ts

@@ -1,10 +1,11 @@
+import { PublicKey } from "@solana/web3.js";
 import {
   Signer,
   transactionBuilder,
   TransactionBuilder,
   Umi,
 } from "@metaplex-foundation/umi";
-import { PublicKey } from "@solana/web3.js";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   fromBaseUnit,
   getTokenAccount,
@@ -13,8 +14,7 @@ import {
   tokenInfo,
 } from "../../utils";
 import { TokenType } from "../../generated";
-import { FlashLoanDetails } from "../../types";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { FlashLoanDetails, ProgramEnv } from "../../types";
 
 export abstract class FlProviderBase {
   protected flSigners: Signer[] = [];
@@ -24,7 +24,8 @@ export abstract class FlProviderBase {
     protected signer: Signer,
     protected authority: PublicKey,
     protected supplyMint: PublicKey,
-    protected debtMint: PublicKey
+    protected debtMint: PublicKey,
+    protected programEnv: ProgramEnv = "Prod"
   ) {}
 
   abstract initialize(): Promise<void>;

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -1,3 +1,4 @@
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import {
   AccountMeta,
   createSignerFromKeypair,
@@ -6,6 +7,7 @@ import {
   transactionBuilder,
   TransactionBuilder,
 } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { MARGINFI_ACCOUNTS } from "../../constants";
 import {
   Bank,
@@ -19,7 +21,6 @@ import {
   safeFetchAllBank,
 } from "../../marginfi-sdk";
 import { FlProviderBase } from "./flProviderBase";
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import {
   bytesToI80F48,
   consoleLog,
@@ -34,9 +35,8 @@ import {
   toBps,
   tokenInfo,
 } from "../../utils";
-import { TokenType } from "../../generated";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { FlashLoanDetails } from "../../types";
+import { TokenType } from "../../generated";
 
 interface IMFIAccount {
   signer?: Signer;
@@ -116,7 +116,6 @@ export class MarginfiFlProvider extends FlProviderBase {
       (x) => x.group.toString() == this.liquidityBank(sources[0]).group
     );
 
-    // TODO: instead of picking first compatibleMarginfiAccoutn, pick one where we already have it in the marginfi Lut
     const signer =
       compatibleMarginfiAccounts.length > 0
         ? undefined
@@ -291,13 +290,13 @@ export class MarginfiFlProvider extends FlProviderBase {
     const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource)!;
 
     const remainingAccounts: AccountMeta[] = [];
-    let includedFlashLoanToken = false;
+    let flBankHadPrevBalance = false;
 
     if (iMfiAccount?.accountData) {
       iMfiAccount.accountData.lendingAccount.balances.forEach(async (x) => {
         if (x.active) {
           if (x.bankPk.toString() === bank.publicKey.toString()) {
-            includedFlashLoanToken = true;
+            flBankHadPrevBalance = true;
           }
 
           // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
@@ -324,35 +323,12 @@ export class MarginfiFlProvider extends FlProviderBase {
         }
       });
     }
-    if (!includedFlashLoanToken) {
-      remainingAccounts.push(
-        ...[
-          {
-            pubkey: bank.publicKey,
-            isSigner: false,
-            isWritable: false,
-          },
-          {
-            pubkey: publicKey(associatedBankAccs.priceOracle),
-            isSigner: false,
-            isWritable: false,
-          },
-        ]
-      );
-    }
-
-    const closeBalances = remainingAccounts
-      .filter(
-        (x, index) =>
-          index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString()
-      )
-      .map((x) => toWeb3JsPublicKey(x.pubkey));
 
     return transactionBuilder()
       .add(
         lendingAccountRepay(this.umi, {
           amount: flashLoan.baseUnitAmount,
-          repayAll: false,
+          repayAll: !flBankHadPrevBalance,
           bank: bank.publicKey,
           bankLiquidityVault: publicKey(associatedBankAccs.liquidityVault),
           marginfiAccount: publicKey(iMfiAccount.accountPk),
@@ -366,13 +342,6 @@ export class MarginfiFlProvider extends FlProviderBase {
           ),
         })
       )
-      .add(
-        closeBalances.length
-          ? closeBalances.map((bank) =>
-              this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
-            )
-          : []
-      )
       .add(
         lendingAccountEndFlashloan(this.umi, {
           marginfiAccount: publicKey(iMfiAccount.accountPk),

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -1,4 +1,5 @@
 import { QuoteResponse } from "@jup-ag/api";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { JupSwapManager, SwapParams, SwapInput } from "../swap";
@@ -13,7 +14,6 @@ import {
   toBaseUnit,
   tokenInfo,
 } from "../../utils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export class RebalanceSwapManager {
   public swapParams!: SwapParams;

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -1,3 +1,6 @@
+import { PublicKey } from "@solana/web3.js";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { transactionBuilder } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../solauto";
 import {
   FlashLoanRequirements,
@@ -14,8 +17,6 @@ import {
   safeGetPrice,
   tokenInfo,
 } from "../../utils";
-import { getRebalanceValues, RebalanceValues } from "./rebalanceValues";
-import { SolautoFeesBps } from "./solautoFees";
 import {
   PositionTokenState,
   RebalanceDirection,
@@ -25,10 +26,9 @@ import {
   TokenBalanceChangeType,
   TokenType,
 } from "../../generated";
-import { PublicKey } from "@solana/web3.js";
+import { getRebalanceValues, RebalanceValues } from "./rebalanceValues";
+import { SolautoFeesBps } from "./solautoFees";
 import { RebalanceSwapManager } from "./rebalanceSwapManager";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { transactionBuilder } from "@metaplex-foundation/umi";
 
 export class RebalanceTxBuilder {
   private values!: RebalanceValues;