@0dotxyz/p0-ts-sdk 1.2.0-alpha.1 → 1.2.0

package/dist/index.cjs

@@ -43411,7 +43411,7 @@ async function buildSwapCollateralFlashloanTx({
         driftSpotMarket: driftState.spotMarketState,
         userRewards: driftState.userRewards,
         withdrawAll: true,
-        isSync: true,
+        isSync: false,
         opts: {
           createAtas: false,
           wrapAndUnwrapSol: false,
@@ -43868,7 +43868,7 @@ async function buildSwapDebtFlashloanTx({
 // src/services/account/services/account-simulation.service.ts
 async function simulateAccountHealthCacheWithFallback(props) {
   let marginfiAccount = props.marginfiAccount;
-  const activeBalances = props.balances.filter((b) => b.active);
+  const activeBalances = marginfiAccount.balances.filter((b) => b.active);
   const { assets: assetValueEquity, liabilities: liabilityValueEquity } = computeHealthComponentsWithoutBiasLegacy(
     activeBalances,
     props.bankMap,
@@ -43879,8 +43879,7 @@ async function simulateAccountHealthCacheWithFallback(props) {
     const simulatedAccount = await simulateAccountHealthCache({
       program: props.program,
       bankMap: props.bankMap,
-      marginfiAccountPk: props.marginfiAccount.address,
-      balances: props.balances,
+      marginfiAccount: props.marginfiAccount,
       bankMetadataMap: props.bankMetadataMap
     });
     simulatedAccount.healthCache.assetValueEquity = bigNumberToWrappedI80F48(assetValueEquity);
@@ -43921,8 +43920,8 @@ async function simulateAccountHealthCacheWithFallback(props) {
   return { marginfiAccount };
 }
 async function simulateAccountHealthCache(props) {
-  const { program, bankMap, marginfiAccountPk, balances, bankMetadataMap } = props;
-  const activeBalances = balances.filter((b) => b.active);
+  const { program, bankMap, marginfiAccount, bankMetadataMap } = props;
+  const activeBalances = marginfiAccount.balances.filter((b) => b.active);
   const activeBanks = activeBalances.map((balance) => bankMap.get(balance.bankPk.toBase58())).filter((bank) => !!bank);
   const kaminoBanks = activeBanks.filter((bank) => bank.config.assetTag === 3 /* KAMINO */);
   const driftBanks = activeBanks.filter((bank) => bank.config.assetTag === 4 /* DRIFT */);
@@ -43936,7 +43935,7 @@ async function simulateAccountHealthCache(props) {
   const fundAccountIx = web3_js.SystemProgram.transfer({
     fromPubkey: new web3_js.PublicKey("DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD"),
     // marginfi SOL VAULT
-    toPubkey: program.provider.publicKey,
+    toPubkey: marginfiAccount.authority,
     lamports: 1e8
     // 0.1 SOL
   });
@@ -43975,7 +43974,7 @@ async function simulateAccountHealthCache(props) {
     swbPullOracles: staleSwbOracles.map((oracle) => ({
       key: oracle.oracleKey
     })),
-    feePayer: program.provider.publicKey,
+    feePayer: marginfiAccount.authority,
     connection: program.provider.connection
   }) : { instructions: [], luts: [] };
   const updateDriftMarketIxs = updateDriftMarketData.map((market) => ({
@@ -43985,16 +43984,16 @@ async function simulateAccountHealthCache(props) {
   }));
   const healthPulseIxs = await makePulseHealthIx2(
     program,
-    marginfiAccountPk,
+    marginfiAccount.address,
     bankMap,
-    balances,
+    marginfiAccount.balances,
     activeBalances.map((b) => b.bankPk),
     []
   );
   const txs = [];
   const additionalTx = new web3_js.VersionedTransaction(
     new web3_js.TransactionMessage({
-      payerKey: program.provider.publicKey,
+      payerKey: marginfiAccount.authority,
       recentBlockhash: blockhash,
       instructions: [
         computeIx,
@@ -44007,7 +44006,7 @@ async function simulateAccountHealthCache(props) {
   txs.push(additionalTx);
   const swbTx = new web3_js.VersionedTransaction(
     new web3_js.TransactionMessage({
-      payerKey: program.provider.publicKey,
+      payerKey: marginfiAccount.authority,
       recentBlockhash: blockhash,
       instructions: [...crankSwbIxs.instructions]
     }).compileToV0Message([...crankSwbIxs.luts])
@@ -44015,7 +44014,7 @@ async function simulateAccountHealthCache(props) {
   txs.push(swbTx);
   const healthTx = new web3_js.VersionedTransaction(
     new web3_js.TransactionMessage({
-      payerKey: program.provider.publicKey,
+      payerKey: marginfiAccount.authority,
       recentBlockhash: blockhash,
       instructions: [computeIx, ...healthPulseIxs.instructions]
     }).compileToV0Message([])
@@ -44026,7 +44025,7 @@ async function simulateAccountHealthCache(props) {
     throw new Error("Too many transactions");
   }
   const simulationResult = await simulateBundle(program.provider.connection.rpcEndpoint, txs, [
-    marginfiAccountPk
+    marginfiAccount.address
   ]);
   const postExecutionAccount = simulationResult.find(
     (result) => result.postExecutionAccounts.length > 0
@@ -44241,23 +44240,19 @@ var fetchMarginfiAccountAddresses = async (program, authority, group) => {
   return marginfiAccounts;
 };
 var fetchMarginfiAccountData = async (program, marginfiAccountPk, bankMap, bankMetadataMap) => {
-  const marginfiAccountRaw = await program.account.marginfiAccount.fetch(marginfiAccountPk, "confirmed");
-  const marginfiAccount = parseMarginfiAccountRaw(
+  const marginfiAccountRaw = await program.account.marginfiAccount.fetch(
     marginfiAccountPk,
-    marginfiAccountRaw
+    "confirmed"
   );
+  const marginfiAccount = parseMarginfiAccountRaw(marginfiAccountPk, marginfiAccountRaw);
   try {
     const simulatedAccount = await simulateAccountHealthCache({
       program,
       bankMap,
-      marginfiAccountPk,
-      balances: marginfiAccount.balances,
+      marginfiAccount,
       bankMetadataMap
     });
-    const marginfiAccountWithCache = parseMarginfiAccountRaw(
-      marginfiAccountPk,
-      simulatedAccount
-    );
+    const marginfiAccountWithCache = parseMarginfiAccountRaw(marginfiAccountPk, simulatedAccount);
     return { marginfiAccount: marginfiAccountWithCache };
   } catch (e) {
     console.error("Error simulating account health cache", e);
@@ -44279,10 +44274,7 @@ async function findRandomAvailableAccountIndex(connection, programId, group, aut
   const BATCH_SIZE = 16;
   const MAX_ATTEMPTS = 8;
   for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
-    const indices = randomDistinctIndices(
-      Math.min(BATCH_SIZE, MAX_INDEX),
-      MAX_INDEX
-    );
+    const indices = randomDistinctIndices(Math.min(BATCH_SIZE, MAX_INDEX), MAX_INDEX);
     const pdas = indices.map(
       (i) => deriveMarginfiAccount(programId, group, authority, i, thirdPartyId)[0]
     );
@@ -47087,7 +47079,6 @@ var MarginfiAccount = class _MarginfiAccount {
       bankMap,
       oraclePrices,
       marginfiAccount: this,
-      balances: this.balances,
       bankMetadataMap
     });
     return {
@@ -48642,16 +48633,23 @@ var Project0Client = class _Project0Client {
    * @param accountAddress - The public key of the marginfi account
    * @returns A wrapped account ready to use
    */
-  async fetchAccount(accountAddress) {
-    const bankMap = new Map(this.banks.map((b) => [b.address.toBase58(), b]));
-    const { marginfiAccount } = await fetchMarginfiAccountData(
-      this.program,
+  async fetchAccount(accountAddress, skipHealthCache) {
+    const marginfiAccountRaw = await this.program.account.marginfiAccount.fetch(accountAddress);
+    let marginfiAccountParsed = MarginfiAccount.fromAccountParsed(
       accountAddress,
-      bankMap,
-      this.bankIntegrationMap
+      marginfiAccountRaw
     );
-    const account = MarginfiAccount.fromAccountType(marginfiAccount);
-    return new MarginfiAccountWrapper(account, this);
+    if (!skipHealthCache) {
+      const bankMap = new Map(this.banks.map((b) => [b.address.toBase58(), b]));
+      const { account: simulatedAccount } = await marginfiAccountParsed.simulateHealthCache(
+        this.program,
+        bankMap,
+        this.oraclePriceByBank,
+        this.bankIntegrationMap
+      );
+      marginfiAccountParsed = simulatedAccount;
+    }
+    return new MarginfiAccountWrapper(marginfiAccountParsed, this);
   }
   static async initialize(connection, config) {
     const { groupPk, programId } = config;