@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/local/logPositions.ts

@@ -1,26 +1,15 @@
-import { publicKey } from "@metaplex-foundation/umi";
 import {
   buildIronforgeApiUrl,
-  calcNetWorthUsd,
-  calcSupplyUsd,
-  currentUnixSeconds,
-  eligibleForRebalance,
   fetchTokenPrices,
+  getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
-  PositionState,
-  positionStateWithLatestPrices,
-  retryWithExponentialBackoff,
-  safeFetchAllSolautoPosition,
   safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
-  solautoStrategyName,
 } from "../src";
 import { PublicKey } from "@solana/web3.js";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
 import { config } from "dotenv";
-import { getBatches } from "./shared";
 
 config({ path: path.join(__dirname, ".env") });
 
@@ -102,23 +91,12 @@ async function main(filterWhitelist: boolean) {
     );
   }
 
-  const batches = getBatches(positions, 30);
-
-  const solautoPositionsData = (
-    await Promise.all(
-      batches.map(async (pubkeys) => {
-        return retryWithExponentialBackoff(
-          async () =>
-            await safeFetchAllSolautoPosition(
-              umi,
-              pubkeys.map((x) => publicKey(x.publicKey!))
-            )
-        );
-      })
+  const positionsEx = (
+    await getPositionExBulk(
+      umi,
+      positions.map((x) => new PublicKey(x.publicKey!))
     )
-  )
-    .flat()
-    .sort((a, b) => calcNetWorthUsd(a.state) - calcNetWorthUsd(b.state));
+  ).sort((a, b) => a.netWorthUsd() - b.netWorthUsd());
 
   const tokensUsed = Array.from(
     new Set(
@@ -128,49 +106,25 @@ async function main(filterWhitelist: boolean) {
       ])
     )
   );
-
-  const tokenBatches = getBatches(tokensUsed, 15);
-  await Promise.all(
-    tokenBatches.map(async (batch) => {
-      await fetchTokenPrices(batch.map((x) => new PublicKey(x)));
-    })
-  );
+  await fetchTokenPrices(tokensUsed.map((x) => new PublicKey(x)));
 
   console.log("\n\n");
 
-  const latestStates: PositionState[] = [];
   let unhealthyPositions = 0;
   let awaitingBoostPositions = 0;
 
-  for (const pos of solautoPositionsData) {
-    const strategy = solautoStrategyName(
-      toWeb3JsPublicKey(pos.state.supply.mint),
-      toWeb3JsPublicKey(pos.state.debt.mint)
+  for (const pos of positionsEx) {
+    await pos.updateWithLatestPrices(
+      safeGetPrice(pos.state().supply.mint),
+      safeGetPrice(pos.state().debt.mint)
     );
 
-    const latestState = await positionStateWithLatestPrices(
-      pos.state,
-      safeGetPrice(pos.state.supply.mint),
-      safeGetPrice(pos.state.debt.mint)
-    );
-    latestStates.push(latestState);
-
-    const actionToTake = eligibleForRebalance(
-      latestState,
-      pos.position.settingParams,
-      pos.position.dca,
-      currentUnixSeconds(),
-      safeGetPrice(latestState.supply.mint)!,
-      safeGetPrice(latestState.debt.mint)!,
-      0
-    );
+    const actionToTake = pos.eligibleForRebalance(0);
 
-    const repayFrom =
-      pos.position.settingParams.repayToBps +
-      pos.position.settingParams.repayGap;
+    const repayFrom = pos.settings()!.repayToBps + pos.settings()!.repayGap;
     const unhealthy = actionToTake === "repay";
     const healthText = unhealthy
-      ? `(Unhealthy: ${latestState.liqUtilizationRateBps - repayFrom}bps)`
+      ? `(Unhealthy: ${pos.state().liqUtilizationRateBps - repayFrom}bps)`
       : "";
     if (unhealthy) {
       unhealthyPositions += 1;
@@ -184,30 +138,30 @@ async function main(filterWhitelist: boolean) {
 
     console.log(
       pos.publicKey.toString(),
-      `(${pos.authority.toString()} ${pos.positionId})`
+      `(${pos.data().authority!.toString()} ${pos.data().positionId})`
     );
     console.log(
-      `${strategy}: $${formatNumber(calcNetWorthUsd(latestState), 2, 10000, 2)} ${healthText} ${boostText}`
+      `${pos.strategyName()}: $${formatNumber(pos.netWorthUsd(), 2, 10000, 2)} ${healthText} ${boostText}`
     );
   }
 
   console.log(
     "\nTotal positions:",
-    solautoPositionsData.length,
+    positionsEx.length,
     unhealthyPositions ? ` (unhealthy: ${unhealthyPositions})` : "",
     awaitingBoostPositions ? ` (awaiting boost: ${awaitingBoostPositions})` : ""
   );
   console.log(
     "Total users:",
-    Array.from(new Set(solautoPositionsData.map((x) => x.authority.toString())))
+    Array.from(new Set(positionsEx.map((x) => x.data().authority!.toString())))
       .length
   );
 
-  const tvl = latestStates
-    .map((x) => calcSupplyUsd(x))
+  const tvl = positionsEx
+    .map((x) => x.supplyUsd())
     .reduce((acc, curr) => acc + curr, 0);
-  const netWorth = latestStates
-    .map((x) => calcNetWorthUsd(x))
+  const netWorth = positionsEx
+    .map((x) => x.netWorthUsd())
     .reduce((acc, curr) => acc + curr, 0);
 
   console.log(`TVL: $${formatNumber(tvl, 2, 10000, 2)}`);

package/local/shared.ts

@@ -8,15 +8,11 @@ import {
   VersionedTransaction,
   PublicKey,
 } from "@solana/web3.js";
-import { buildHeliusApiUrl, getSolanaRpcConnection } from "../src/utils/solanaUtils";
-
-export function getBatches<T>(items: T[], batchSize: number): T[][] {
-  const batches: T[][] = [];
-  for (let i = 0; i < items.length; i += batchSize) {
-    batches.push(items.slice(i, i + batchSize));
-  }
-  return batches;
-}
+import {
+  buildHeliusApiUrl,
+  getSolanaRpcConnection,
+} from "../src/utils/solanaUtils";
+import { getBatches } from "../src";
 
 function loadSecretKey(keypairPath: string) {
   const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
@@ -30,19 +26,25 @@ export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
 }
 
 const keypair = Keypair.fromSecretKey(getSecretKey("solauto-fees"));
-const [connection, _] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY ?? ""));
+const [connection, _] = getSolanaRpcConnection(
+  buildHeliusApiUrl(process.env.HELIUS_API_KEY ?? "")
+);
 
-async function createAndSendV0Tx(txInstructions: TransactionInstruction[]) {
+export async function createAndSendV0Tx(
+  txInstructions: TransactionInstruction[],
+  payer: Keypair,
+  otherSigners?: Keypair[]
+) {
   let latestBlockhash = await connection.getLatestBlockhash("finalized");
 
   const messageV0 = new TransactionMessage({
-    payerKey: keypair.publicKey,
+    payerKey: payer.publicKey,
     recentBlockhash: latestBlockhash.blockhash,
     instructions: txInstructions,
   }).compileToV0Message();
   const transaction = new VersionedTransaction(messageV0);
 
-  transaction.sign([keypair]);
+  transaction.sign([payer, ...(otherSigners ?? [])]);
 
   const txid = await connection.sendTransaction(transaction, {
     maxRetries: 5,
@@ -67,19 +69,22 @@ async function addAddressesIfNeeded(
   const addresses = addressesToAdd
     .filter((x) => !existingAddresses.includes(x))
     .map((x) => new PublicKey(x));
-  
+
   if (addresses.length > 0) {
     const batches = getBatches(addresses, 20);
     for (const addressBatch of batches) {
-      console.log(addressBatch.map(x => x.toString()));
-      await createAndSendV0Tx([
-        AddressLookupTableProgram.extendLookupTable({
-          payer: keypair.publicKey,
-          authority: keypair.publicKey,
-          lookupTable: lookupTableAddress,
-          addresses: addressBatch,
-        }),
-      ]);
+      console.log(addressBatch.map((x) => x.toString()));
+      await createAndSendV0Tx(
+        [
+          AddressLookupTableProgram.extendLookupTable({
+            payer: keypair.publicKey,
+            authority: keypair.publicKey,
+            lookupTable: lookupTableAddress,
+            addresses: addressBatch,
+          }),
+        ],
+        keypair
+      );
     }
   }
 }
@@ -99,7 +104,7 @@ export async function updateLookupTable(
     });
     lookupTableAddress = addr;
     console.log("Lookup Table Address:", lookupTableAddress.toString());
-    await createAndSendV0Tx([createLutIx]);
+    await createAndSendV0Tx([createLutIx], keypair);
   }
 
   const existingAccounts =

package/local/txSandbox.ts

@@ -0,0 +1,27 @@
+import { Keypair } from "@solana/web3.js";
+import {
+  buildIronforgeApiUrl,
+  getSolanaRpcConnection,
+  SOLAUTO_PROD_PROGRAM,
+  SOLAUTO_TEST_PROGRAM,
+} from "../src";
+import { getSecretKey } from "./shared";
+import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
+
+const testProgram = true;
+
+export async function main() {
+  const [conn, umi] = getSolanaRpcConnection(
+    buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
+  );
+  const signer = createSignerFromKeypair(
+    umi,
+    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
+  );
+
+
+}
+
+main();

package/local/updateMarginfiLUT.ts

@@ -1,13 +1,48 @@
-import { PublicKey } from "@solana/web3.js";
+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 } from "../src/marginfi-sdk";
-import { updateLookupTable } from "./shared";
+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,
+  signerIdentity,
+} from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsKeypair,
+  toWeb3JsInstruction,
+  toWeb3JsKeypair,
+} from "@metaplex-foundation/umi-web3js-adapters";
 
 const LOOKUP_TABLE_ADDRESS = new PublicKey(MARGINFI_ACCOUNTS_LOOKUP_TABLE);
+let [, umi] = getSolanaRpcConnection(
+  buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!)
+);
+umi = umi.use(
+  signerIdentity(
+    createSignerFromKeypair(umi, umi.eddsa.generateKeypair()),
+    true
+  )
+);
+const solautoManagerKeypair = Keypair.fromSecretKey(
+  getSecretKey("solauto-manager")
+);
+const solautoManager = createSignerFromKeypair(
+  umi,
+  fromWeb3JsKeypair(solautoManagerKeypair)
+);
 
 async function addBanks() {
   for (const group in MARGINFI_ACCOUNTS) {
@@ -27,9 +62,50 @@ async function addBanks() {
   }
 }
 
+async function addImfiAccounts() {
+  const imfiAccounts = await getEmptyMarginfiAccountsByAuthority(
+    umi,
+    SOLAUTO_MANAGER
+  );
+
+  for (const group in MARGINFI_ACCOUNTS) {
+    const emptyAccs = imfiAccounts.filter((x) => x.group.toString() === group);
+    if (emptyAccs.length > 0) {
+      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
+      );
+    }
+  }
+}
+
 updateLookupTable(
   [DEFAULT_MARGINFI_GROUP, MARGINFI_PROGRAM_ID],
   LOOKUP_TABLE_ADDRESS
 );
 
-addBanks();
+addBanks().then((x) => x);
+
+addImfiAccounts().then((x) => x);
+
+// EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7
+// AuoepJfrCrkQF2PeUAgpnnJybRoiff82cNdwXTqyjjvm
+// Bno3JybASPc1jNBZ9rnrdKVvbhk6UNMvSsYvgtitq3zb

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.581",
+  "version": "1.0.583",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
   "author": "Chelioso",
-  "license": "MIT",
   "scripts": {
     "build": "rm -rf dist && npx tsc",
+    "test:all": "pnpm test:unit && pnpm test:txs",
     "test:txs": "ts-mocha -p ./tsconfig.json -t 1000000 tests/transactions/**/*.ts",
-    "test:unit": "ts-mocha -p ./tsconfig.json -t 1000000 tests/unit/**/*.ts",
-    "test:all": "pnpm test:unit && pnpm test:txs"
+    "test:unit": "ts-mocha -p ./tsconfig.json -t 1000000 tests/unit/**/*.ts"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
@@ -19,12 +18,10 @@
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.1",
     "@metaplex-foundation/umi-signer-wallet-adapters": "^0.9.1",
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
-    "@mrgnlabs/marginfi-client-v2": "^4.0.0",
-    "@mrgnlabs/mrgn-common": "^1.8.0",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.95.8",
     "@switchboard-xyz/common": "=3.0.12",
-    "@switchboard-xyz/on-demand": "=2.4.0",
+    "@switchboard-xyz/on-demand": "=1.2.51",
     "axios": "^1.7.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",

package/src/constants/solautoConstants.ts

@@ -20,7 +20,7 @@ export const SOLAUTO_TEST_PROGRAM = new PublicKey(
   "TesTjfQ6TbXv96Tv6fqr95XTZ1LYPxtkafmShN9PjBp"
 );
 
-(globalThis as any).LOCAL_TEST = false;
+(globalThis as any).SHOW_LOGS = false;
 
 export const BASIS_POINTS = 10000;
 
@@ -29,6 +29,8 @@ export const MIN_REPAY_GAP_BPS = 50;
 export const MIN_BOOST_GAP_BPS = 50;
 export const MIN_USD_SUPPORTED_POSITION = 1000;
 
+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";
@@ -60,11 +62,4 @@ export const STANDARD_LUT_ACCOUNTS = [
 ].map((x) => x.toString());
 
 // TODO:
-export const BROKEN_TOKENS = [
-  JUP,
-  JLP,
-  WETH,
-  HNT,
-  JTO,
-  PYTH
-]
+export const BROKEN_TOKENS = [JUP, JLP, WETH, HNT, JTO, PYTH];

package/src/constants/switchboardConstants.ts

@@ -14,22 +14,27 @@ export const SWITCHBOARD_PRICE_FEED_IDS: { [key: string]: SwitchboardFeed } = {
   },
   [tokens.H_SOL]: {
     feedId: "1snBjCaHejZqQsAqkELAKNaqUrDNNCr7zmNX6qaQCzg",
-    feedHash: "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367"
+    feedHash:
+      "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367",
   },
   [tokens.POPCAT]: {
     feedId: "FTcFqwCjAgv2VMaowQ9XSBcesVzFzZkaju25nKio6bki",
-    feedHash: "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f"
+    feedHash:
+      "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f",
   },
   [tokens.RETARDIO]: {
     feedId: "EvPXnpMoyrj4B6P55LDP2VpSLkTBWom2SqL4486ToNhM",
-    feedHash: "0x982d968a0608046986aec84d95ae884c4dc2140f0b3e14ed7b8161ada573d18b"
+    feedHash:
+      "0x982d968a0608046986aec84d95ae884c4dc2140f0b3e14ed7b8161ada573d18b",
   },
   [tokens.BILLY]: {
     feedId: "uBe4er4VSMgYvBNwSbFctSShRXNPkCfaPh7zHMBFeBi",
-    feedHash: "0xbbd0d393111ff1ad7cc1a2f15ce24b61d4d6b3e99e440aa77572bd7f1da9afbe"
+    feedHash:
+      "0xbbd0d393111ff1ad7cc1a2f15ce24b61d4d6b3e99e440aa77572bd7f1da9afbe",
   },
   [tokens.HMTR]: {
     feedId: "F2hKL67W4ZDe9k7ZrJKnp2LhWrgqg2JQTkJf2dgBggRD",
-    feedHash: "0x61999c4f8a03208b5b5b50663323b1ef8d0acbb3642ec79053b33b5768605fb5"
+    feedHash:
+      "0x61999c4f8a03208b5b5b50663323b1ef8d0acbb3642ec79053b33b5768605fb5",
   },
 };

package/src/generated/accounts/solautoPosition.ts

@@ -88,7 +88,7 @@ export function getSolautoPositionAccountDataSerializer(): Serializer<
       ['position', getPositionDataSerializer()],
       ['state', getPositionStateSerializer()],
       ['rebalance', getRebalanceDataSerializer()],
-      ['padding', array(u32(), { size: 32 })],
+      ['padding', array(u32(), { size: 20 })],
     ],
     { description: 'SolautoPositionAccountData' }
   ) as Serializer<SolautoPositionAccountDataArgs, SolautoPositionAccountData>;
@@ -188,7 +188,7 @@ export function getSolautoPositionGpaBuilder(
       position: [40, getPositionDataSerializer()],
       state: [360, getPositionStateSerializer()],
       rebalance: [648, getRebalanceDataSerializer()],
-      padding: [704, array(u32(), { size: 32 })],
+      padding: [752, array(u32(), { size: 20 })],
     })
     .deserializeUsing<SolautoPosition>((account) =>
       deserializeSolautoPosition(account)

package/src/generated/errors/solauto.ts

@@ -15,7 +15,7 @@ type ProgramErrorConstructor = new (
 const codeToErrorMap: Map<number, ProgramErrorConstructor> = new Map();
 const nameToErrorMap: Map<string, ProgramErrorConstructor> = new Map();
 
-/** IncorrectAccounts: Missing or incorrect accounts provided for the given instruction */
+/** IncorrectAccounts: Missing or incorrect accounts provided for the given instructions */
 export class IncorrectAccountsError extends ProgramError {
   override readonly name: string = 'IncorrectAccounts';
 
@@ -23,7 +23,7 @@ export class IncorrectAccountsError extends ProgramError {
 
   constructor(program: Program, cause?: Error) {
     super(
-      'Missing or incorrect accounts provided for the given instruction',
+      'Missing or incorrect accounts provided for the given instructions',
       program,
       cause
     );
@@ -113,14 +113,18 @@ export class InstructionIsCPIError extends ProgramError {
 codeToErrorMap.set(0x6, InstructionIsCPIError);
 nameToErrorMap.set('InstructionIsCPI', InstructionIsCPIError);
 
-/** IncorrectInstructions: Incorrect set of instructions in the transaction */
+/** IncorrectInstructions: Incorrect set of instructions or instruction data in the transaction */
 export class IncorrectInstructionsError extends ProgramError {
   override readonly name: string = 'IncorrectInstructions';
 
   readonly code: number = 0x7; // 7
 
   constructor(program: Program, cause?: Error) {
-    super('Incorrect set of instructions in the transaction', program, cause);
+    super(
+      'Incorrect set of instructions or instruction data in the transaction',
+      program,
+      cause
+    );
   }
 }
 codeToErrorMap.set(0x7, IncorrectInstructionsError);
@@ -143,6 +147,43 @@ export class IncorrectDebtAdjustmentError extends ProgramError {
 codeToErrorMap.set(0x8, IncorrectDebtAdjustmentError);
 nameToErrorMap.set('IncorrectDebtAdjustment', IncorrectDebtAdjustmentError);
 
+/** InvalidRebalanceMade: Invalid rebalance was made. Target supply USD and target debt USD was not met */
+export class InvalidRebalanceMadeError extends ProgramError {
+  override readonly name: string = 'InvalidRebalanceMade';
+
+  readonly code: number = 0x9; // 9
+
+  constructor(program: Program, cause?: Error) {
+    super(
+      'Invalid rebalance was made. Target supply USD and target debt USD was not met',
+      program,
+      cause
+    );
+  }
+}
+codeToErrorMap.set(0x9, InvalidRebalanceMadeError);
+nameToErrorMap.set('InvalidRebalanceMade', InvalidRebalanceMadeError);
+
+/** NonAuthorityProvidedTargetLTV: Cannot provide a target liquidation utilization rate if the instruction is not signed by the position authority */
+export class NonAuthorityProvidedTargetLTVError extends ProgramError {
+  override readonly name: string = 'NonAuthorityProvidedTargetLTV';
+
+  readonly code: number = 0xa; // 10
+
+  constructor(program: Program, cause?: Error) {
+    super(
+      'Cannot provide a target liquidation utilization rate if the instruction is not signed by the position authority',
+      program,
+      cause
+    );
+  }
+}
+codeToErrorMap.set(0xa, NonAuthorityProvidedTargetLTVError);
+nameToErrorMap.set(
+  'NonAuthorityProvidedTargetLTV',
+  NonAuthorityProvidedTargetLTVError
+);
+
 /**
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors

package/src/generated/instructions/claimReferralFees.ts

@@ -38,7 +38,7 @@ export type ClaimReferralFeesInstructionAccounts = {
   referralState: PublicKey | Pda;
   referralFeesDestTa: PublicKey | Pda;
   referralFeesDestMint: PublicKey | Pda;
-  referralAuthority?: PublicKey | Pda;
+  referralAuthority: PublicKey | Pda;
   feesDestinationTa?: PublicKey | Pda;
 };
 

package/src/generated/instructions/closePosition.ts

@@ -33,7 +33,7 @@ export type ClosePositionInstructionAccounts = {
   tokenProgram?: PublicKey | Pda;
   ataProgram?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
-  protocolAccount: PublicKey | Pda;
+  lpUserAccount: PublicKey | Pda;
   positionSupplyTa: PublicKey | Pda;
   signerSupplyTa: PublicKey | Pda;
   positionDebtTa: PublicKey | Pda;
@@ -102,10 +102,10 @@ export function closePosition(
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
-    protocolAccount: {
+    lpUserAccount: {
       index: 5,
       isWritable: true as boolean,
-      value: input.protocolAccount ?? null,
+      value: input.lpUserAccount ?? null,
     },
     positionSupplyTa: {
       index: 6,

package/src/generated/instructions/marginfiOpenPosition.ts

@@ -8,8 +8,6 @@
 
 import {
   Context,
-  Option,
-  OptionOrNullable,
   Pda,
   PublicKey,
   Signer,
@@ -20,9 +18,7 @@ import {
 import {
   Serializer,
   mapSerializer,
-  option,
   struct,
-  u64,
   u8,
 } from '@metaplex-foundation/umi/serializers';
 import {
@@ -67,13 +63,11 @@ export type MarginfiOpenPositionInstructionData = {
   discriminator: number;
   positionType: PositionType;
   positionData: UpdatePositionData;
-  marginfiAccountSeedIdx: Option<bigint>;
 };
 
 export type MarginfiOpenPositionInstructionDataArgs = {
   positionType: PositionTypeArgs;
   positionData: UpdatePositionDataArgs;
-  marginfiAccountSeedIdx: OptionOrNullable<number | bigint>;
 };
 
 export function getMarginfiOpenPositionInstructionDataSerializer(): Serializer<
@@ -90,7 +84,6 @@ export function getMarginfiOpenPositionInstructionDataSerializer(): Serializer<
         ['discriminator', u8()],
         ['positionType', getPositionTypeSerializer()],
         ['positionData', getUpdatePositionDataSerializer()],
-        ['marginfiAccountSeedIdx', option(u64())],
       ],
       { description: 'MarginfiOpenPositionInstructionData' }
     ),