@0dotxyz/p0-ts-sdk 2.10.1-alpha.0 → 2.11.0

package/dist/index.cjs

@@ -76854,18 +76854,12 @@ function computeHealthComponentsFromBalances(params) {
   let totalLiabilities = new BigNumber3__default.default(0);
   for (const accountBalance of filteredBalances) {
     const bankKey = accountBalance.bankPk.toBase58();
-    const bank = banksMap.get(bankKey);
-    if (!bank) {
-      console.warn(
-        `Bank ${shortenAddress(accountBalance.bankPk)} not found, excluding from health computation`
-      );
-      continue;
-    }
+    const bank = requireBank(banksMap, accountBalance.bankPk);
     const oraclePrice = oraclePricesByBank.get(bankKey);
     if (!oraclePrice) {
-      console.warn(
-        `Price info for bank ${shortenAddress(accountBalance.bankPk)} not found, excluding from health computation`
-      );
+      if (accountBalance.liabilityShares.gt(0)) {
+        throw Error(`Oracle price for ${bankKey} not found`);
+      }
       continue;
     }
     const emodeWeight = activeEmodeWeightsByBank?.get(bankKey);
@@ -77074,7 +77068,7 @@ function computeLiquidationPriceForBank(params) {
   const { bank, oraclePrice, marginfiAccount, assetShareValueMultiplier, activeEmodeWeights } = params;
   const balance = getBalance(bank.address, marginfiAccount.balances);
   if (!balance.active) return null;
-  const { assets: assetBank, liabilities: liabilitiesBank } = computeBalanceUsdValue({
+  const { assets: assetBank, liabilities: liabilitiesBank } = getBalanceUsdValueWithPriceBias({
     balance,
     bank,
     oraclePrice,
@@ -77088,7 +77082,8 @@ function computeLiquidationPriceForBank(params) {
   const isLending = balance.liabilityShares.isZero();
   const { assets: assetQuantityUi, liabilities: liabQuantitiesUi } = computeQuantityUi(
     balance,
-    bank
+    bank,
+    assetShareValueMultiplier
   );
   let liquidationPrice;
   if (isLending) {
@@ -77194,6 +77189,8 @@ function computeBankRiskAccountKeys(bank) {
     } else if (bank.stakedOracleUsesOnramp && bank.stakedIntegrationAccounts && !bank.stakedIntegrationAccounts.validatorVoteAccount.equals(web3_js.PublicKey.default)) {
       const pool = findPoolAddress(bank.stakedIntegrationAccounts.validatorVoteAccount);
       keys.push(findPoolOnRampAddress(pool));
+    } else {
+      keys.push(web3_js.PublicKey.default);
     }
   }
   return keys;
@@ -78232,7 +78229,6 @@ function createJupiterClient(config = {}) {
 // src/services/account/utils/swap.utils.ts
 function resolvePinnedSwapRoute(swapIxs, expectedInAmountNative) {
   const { quoteResponse } = swapIxs;
-  const expectedIn = new BN8__default.default(expectedInAmountNative);
   let minOut;
   try {
     minOut = new BN8__default.default(quoteResponse.otherAmountThreshold);
@@ -78245,15 +78241,15 @@ function resolvePinnedSwapRoute(swapIxs, expectedInAmountNative) {
     );
   }
   const pinnedIn = new BN8__default.default(quoteResponse.inAmount);
-  if (!pinnedIn.eq(expectedIn)) {
+  if (expectedInAmountNative !== void 0 && !pinnedIn.eq(new BN8__default.default(expectedInAmountNative))) {
     throw new Error(
-      `Pinned swap route (swapOpts.swapIxs) was quoted for a different input amount than the flow will swap: quote inAmount=${pinnedIn.toString()}, flow swap input=${expectedIn.toString()} (native units). Re-quote the pinned route for the exact flow amount.`
+      `Pinned swap route (swapOpts.swapIxs) was quoted for a different input amount than the flow will swap: quote inAmount=${pinnedIn.toString()}, flow swap input=${expectedInAmountNative.toString()} (native units). Re-quote the pinned route for the exact flow amount.`
     );
   }
   return {
     swapInstructions: swapIxs.instructions,
     setupInstructions: [],
-    lookupTables: swapIxs.lookupTables,
+    swapLuts: swapIxs.lookupTables,
     quoteResponse,
     outputAmountNative: minOut
   };
@@ -78367,7 +78363,7 @@ var getSwapIxsForFlashloan = async (params) => {
     return {
       swapInstructions: pinned.swapInstructions,
       setupInstructions: pinned.setupInstructions,
-      addressLookupTableAddresses: pinned.lookupTables,
+      addressLookupTableAddresses: pinned.swapLuts,
       quoteResponse: pinned.quoteResponse
     };
   }
@@ -78565,17 +78561,8 @@ var getJupiterSwapIxsForFlashloan = async ({
     quoteResponse: mapJupiterQuoteToSwapQuoteResult(swapQuote)
   };
 };
-
-// src/services/account/utils/misc.utils.ts
-function floor(value, decimals) {
-  return Math.floor(value * 10 ** decimals) / 10 ** decimals;
-}
-function ceil(value, decimals) {
-  return Math.ceil(value * 10 ** decimals) / 10 ** decimals;
-}
 function computeClosePositionTokenAmount(position, mintDecimals) {
-  const closePositionTokenAmount = position.isLending ? floor(position.amount, mintDecimals) : ceil(position.amount, mintDecimals);
-  return closePositionTokenAmount;
+  return new BigNumber3.BigNumber(position.amount).decimalPlaces(mintDecimals, position.isLending ? BigNumber3.BigNumber.ROUND_FLOOR : BigNumber3.BigNumber.ROUND_CEIL).toNumber();
 }
 function isWholePosition(position, amount, mintDecimals) {
   const closePositionTokenAmount = computeClosePositionTokenAmount(position, mintDecimals);
@@ -83987,7 +83974,7 @@ async function buildSwapDebtFlashloanTx({
     opts: { wrapAndUnwrapSol: false, overrideInferAccounts }
   });
   const runEngine = swapEngineRunner ?? runSwapEngine;
-  const engineResult = await runEngine({
+  const engineResult = swapOpts.swapIxs ? resolvePinnedSwapRoute(swapOpts.swapIxs) : await runEngine({
     inputMint: borrowBank.mint.toBase58(),
     outputMint: repayBank.mint.toBase58(),
     amountNative: uiToNative(estimatedBorrowAmount, borrowBank.mintDecimals).toNumber(),
@@ -84013,7 +84000,8 @@ async function buildSwapDebtFlashloanTx({
   const quoteResponse = engineResult.quoteResponse;
   const outAmount = nativeToUi(quoteResponse.outAmount, repayBank.mintDecimals);
   const outAmountThreshold = nativeToUi(quoteResponse.otherAmountThreshold, repayBank.mintDecimals);
-  const amountToRepay = outAmount > totalPositionAmount ? totalPositionAmount : outAmountThreshold;
+  const repayAll = outAmount > totalPositionAmount;
+  const amountToRepay = repayAll ? totalPositionAmount : outAmountThreshold;
   const borrowAmount = nativeToUi(quoteResponse.inAmount, borrowBank.mintDecimals);
   const borrowIxs = await makeBorrowIx3({
     program,
@@ -84037,14 +84025,7 @@ async function buildSwapDebtFlashloanTx({
     amount: amountToRepay,
     accountAddress: marginfiAccount.address,
     authority: marginfiAccount.authority,
-    repayAll: isWholePosition(
-      {
-        amount: totalPositionAmount,
-        isLending: false
-      },
-      amountToRepay,
-      repayBank.mintDecimals
-    ),
+    repayAll,
     isSync: true,
     opts: {
       wrapAndUnwrapSol: false,
@@ -84503,16 +84484,7 @@ async function buildDepositIxs(params, amountUi) {
 }
 async function runLoopSwapEngine(descriptor, params) {
   const { connection, swapOpts, marginfiAccount, swapEngineRunner } = params;
-  if (swapOpts.swapIxs) {
-    const pinned = resolvePinnedSwapRoute(swapOpts.swapIxs, descriptor.inAmountNative);
-    return {
-      swapInstructions: pinned.swapInstructions,
-      setupInstructions: pinned.setupInstructions,
-      swapLuts: pinned.lookupTables,
-      quoteResponse: pinned.quoteResponse,
-      outputAmountNative: pinned.outputAmountNative
-    };
-  }
+  if (swapOpts.swapIxs) return resolvePinnedSwapRoute(swapOpts.swapIxs, descriptor.inAmountNative);
   const runEngine = swapEngineRunner ?? runSwapEngine;
   const engineResult = await runEngine({
     inputMint: descriptor.inputMint,
@@ -85008,10 +84980,11 @@ async function buildSwapCollateralFlashloanTx({
     });
     sizeConstraintUsed = swapConstraints.sizeConstraint;
     const runEngine = swapEngineRunner ?? runSwapEngine;
-    const engineResult = await runEngine({
+    const amountNative = uiToNative(actualWithdrawAmount, withdrawBank.mintDecimals);
+    const engineResult = swapOpts.swapIxs ? resolvePinnedSwapRoute(swapOpts.swapIxs, amountNative) : await runEngine({
       inputMint: withdrawBank.mint.toBase58(),
       outputMint: depositBank.mint.toBase58(),
-      amountNative: uiToNative(actualWithdrawAmount, withdrawBank.mintDecimals).toNumber(),
+      amountNative: amountNative.toNumber(),
       inputDecimals: withdrawBank.mintDecimals,
       outputDecimals: depositBank.mintDecimals,
       ...swapEngineQuoteFieldsFromOpts(swapOpts),
@@ -85019,7 +84992,11 @@ async function buildSwapCollateralFlashloanTx({
       destinationTokenAccount,
       connection,
       footprint: {
-        instructions: [...cuRequestIxs, ...withdrawIxs.instructions, ...depositIxs.instructions],
+        instructions: [
+          ...cuRequestIxs,
+          ...withdrawIxs.instructions,
+          ...depositIxs.instructions
+        ],
         luts: addressLookupTableAccounts ?? [],
         payer: marginfiAccount.authority,
         sizeConstraint: swapConstraints.sizeConstraint,
@@ -86718,7 +86695,7 @@ var fetchStakePoolActiveStates = async (connection, validatorVoteAccounts) => {
   });
   const poolStakeAddressKeys = Object.keys(poolStakeAddressRecord);
   const poolStakeAccounts = Object.fromEntries(
-    (await chunkedGetRawMultipleAccountInfoOrdered(connection, poolStakeAddressKeys)).map((ai, index) => {
+    (await chunkedGetRawMultipleAccountInfoOrderedWithNulls(connection, poolStakeAddressKeys)).map((ai, index) => {
       const key = poolStakeAddressKeys[index];
       const validatorVote = key ? poolStakeAddressRecord[key] : void 0;
       return [validatorVote, ai?.data || null];
@@ -86726,7 +86703,8 @@ var fetchStakePoolActiveStates = async (connection, validatorVoteAccounts) => {
   );
   validatorVoteAccounts.map((validatorVoteAccount) => {
     const voteAccountKey = validatorVoteAccount.toBase58();
-    const stakeAccount = fetchStakeAccount(poolStakeAccounts[voteAccountKey]);
+    const stakeData = poolStakeAccounts[voteAccountKey];
+    const stakeAccount = stakeData ? fetchStakeAccount(stakeData) : null;
     const poolMintAddress = poolMintAddressRecord[voteAccountKey];
     if (!poolMintAddress) {
       return;
@@ -86813,26 +86791,28 @@ var fetchStakePoolMev = async (connection, validatorVoteAccounts) => {
   const allAddresses = [...poolStakeAddresses, ...onRampAddresses].map(
     (address) => address.toBase58()
   );
-  return chunkedGetRawMultipleAccountInfoOrdered(connection, allAddresses).then((accountInfos) => {
-    const poolStakeInfos = accountInfos.slice(0, poolStakeAddresses.length);
-    const onRampInfos = accountInfos.slice(poolStakeAddresses.length);
-    const rent = 2282280;
-    validatorVoteAccounts.forEach((validatorVoteAccount, index) => {
-      const poolStakeInfo = poolStakeInfos[index];
-      const onRampInfo = onRampInfos[index];
-      if (poolStakeInfo && onRampInfo) {
-        const stakeDecoded = fetchStakeAccount(poolStakeInfo.data);
-        const onrampDecoded = fetchStakeAccount(onRampInfo.data);
-        const poolLamps = poolStakeInfo.lamports - rent - Number(stakeDecoded.stake.delegation.stake.toString());
-        const onrampStake = Number(onrampDecoded.stake.delegation.stake.toString());
-        mev.set(validatorVoteAccount.toBase58(), {
-          pool: poolLamps >= 1e3 ? poolLamps : 0,
-          onramp: onrampStake
-        });
-      }
-    });
-    return mev;
-  });
+  return chunkedGetRawMultipleAccountInfoOrderedWithNulls(connection, allAddresses).then(
+    (accountInfos) => {
+      const poolStakeInfos = accountInfos.slice(0, poolStakeAddresses.length);
+      const onRampInfos = accountInfos.slice(poolStakeAddresses.length);
+      const rent = 2282280;
+      validatorVoteAccounts.forEach((validatorVoteAccount, index) => {
+        const poolStakeInfo = poolStakeInfos[index];
+        const onRampInfo = onRampInfos[index];
+        if (poolStakeInfo && onRampInfo) {
+          const stakeDecoded = fetchStakeAccount(poolStakeInfo.data);
+          const onrampDecoded = fetchStakeAccount(onRampInfo.data);
+          const poolLamps = poolStakeInfo.lamports - rent - Number(stakeDecoded.stake.delegation.stake.toString());
+          const onrampStake = Number(onrampDecoded.stake.delegation.stake.toString());
+          mev.set(validatorVoteAccount.toBase58(), {
+            pool: poolLamps >= 1e3 ? poolLamps : 0,
+            onramp: onrampStake
+          });
+        }
+      });
+      return mev;
+    }
+  );
 };
 
 // src/services/native-stake/utils/serialize.utils.ts
@@ -87272,55 +87252,67 @@ function getValidatorVoteAccountByBank() {
   }
   return _voteAccountByBank;
 }
+var POOL_BOOTSTRAP_LAMPORTS = 1000000000n;
+var STAKE_STATE_DELEGATED = 2;
 async function computeStakedBankMultipliers(stakedBanks, connection) {
   const multiplierByBank = /* @__PURE__ */ new Map();
   if (stakedBanks.length === 0) {
     return multiplierByBank;
   }
   const metadataMap = getStakedBankMetadataMap();
-  const stakedBankAddresses = [];
+  const resolvedBanks = [];
   const poolStakeAddresses = [];
   const lstMintAddresses = [];
+  const onrampAddresses = [];
   for (const bank of stakedBanks) {
     const metadata = metadataMap.get(bank.address.toBase58());
     if (!metadata) {
-      multiplierByBank.set(bank.address.toBase58(), new BigNumber3__default.default(1));
+      multiplierByBank.set(bank.address.toBase58(), new BigNumber3.BigNumber(1));
       continue;
     }
     const pool = findPoolAddress(new web3_js.PublicKey(metadata.validatorVoteAccount));
-    stakedBankAddresses.push(bank.address.toBase58());
+    resolvedBanks.push(bank);
     poolStakeAddresses.push(findPoolStakeAddress(pool));
     lstMintAddresses.push(findPoolMintAddress(pool));
+    onrampAddresses.push(findPoolOnRampAddress(pool));
   }
-  if (stakedBankAddresses.length === 0) {
+  if (resolvedBanks.length === 0) {
     return multiplierByBank;
   }
-  const allAddresses = [
-    ...poolStakeAddresses.map((a) => a.toBase58()),
-    ...lstMintAddresses.map((a) => a.toBase58())
-  ];
-  const accountInfos = await chunkedGetRawMultipleAccountInfoOrdered(connection, allAddresses);
-  const poolStakeInfos = accountInfos.slice(0, poolStakeAddresses.length);
-  const lstMintInfos = accountInfos.slice(poolStakeAddresses.length);
-  for (let i = 0; i < stakedBankAddresses.length; i++) {
-    const bankAddr = stakedBankAddresses[i];
-    const poolStakeInfo = poolStakeInfos[i];
-    const lstMintInfo = lstMintInfos[i];
-    if (!poolStakeInfo || !lstMintInfo) {
-      multiplierByBank.set(bankAddr, new BigNumber3__default.default(1));
-      continue;
+  const allAddresses = [...poolStakeAddresses, ...lstMintAddresses, ...onrampAddresses].map(
+    (a) => a.toBase58()
+  );
+  const [accountInfos, stakeRent] = await Promise.all([
+    chunkedGetRawMultipleAccountInfoOrderedWithNulls(connection, allAddresses),
+    resolvedBanks.some((bank) => bank.stakedOracleUsesOnramp) ? connection.getMinimumBalanceForRentExemption(web3_js.StakeProgram.space) : 0
+  ]);
+  const count = resolvedBanks.length;
+  const aboveRent = (lamports) => Math.max(lamports - stakeRent, 0);
+  resolvedBanks.forEach((bank, i) => {
+    const bankAddr = bank.address.toBase58();
+    const poolStakeInfo = accountInfos[i];
+    const lstMintInfo = accountInfos[count + i];
+    const onrampInfo = accountInfos[2 * count + i];
+    const lstMintSupply = lstMintInfo ? buffer.Buffer.from(lstMintInfo.data.subarray(36, 44)).readBigUInt64LE(0) : 0n;
+    if (!poolStakeInfo || lstMintSupply === 0n) {
+      multiplierByBank.set(bankAddr, new BigNumber3.BigNumber(1));
+      return;
     }
-    const stakeLamports = poolStakeInfo.lamports;
-    const supplyBuffer = lstMintInfo.data.slice(36, 44);
-    const lstMintSupply = Number(buffer.Buffer.from(supplyBuffer).readBigUInt64LE(0));
-    if (lstMintSupply === 0) {
-      multiplierByBank.set(bankAddr, new BigNumber3__default.default(1));
-      continue;
+    if (bank.stakedOracleUsesOnramp) {
+      const value = aboveRent(poolStakeInfo.lamports) + (onrampInfo ? aboveRent(onrampInfo.lamports) : 0);
+      multiplierByBank.set(
+        bankAddr,
+        new BigNumber3.BigNumber(value).dividedBy((lstMintSupply + POOL_BOOTSTRAP_LAMPORTS).toString())
+      );
+      return;
     }
-    const adjustedStake = Math.max(stakeLamports - web3_js.LAMPORTS_PER_SOL, 0);
-    const multiplier = new BigNumber3__default.default(adjustedStake).dividedBy(lstMintSupply);
-    multiplierByBank.set(bankAddr, multiplier);
-  }
+    const delegated = poolStakeInfo.data.readUInt32LE(0) === STAKE_STATE_DELEGATED ? fetchStakeAccount(poolStakeInfo.data).stake.delegation.stake : 0n;
+    const delegatedAboveBootstrap = delegated > POOL_BOOTSTRAP_LAMPORTS ? delegated - POOL_BOOTSTRAP_LAMPORTS : 0n;
+    multiplierByBank.set(
+      bankAddr,
+      new BigNumber3.BigNumber(delegatedAboveBootstrap.toString()).dividedBy(lstMintSupply.toString())
+    );
+  });
   return multiplierByBank;
 }
 var SYSVAR_CLOCK_ID2 = new web3_js.PublicKey("SysvarC1ock11111111111111111111111111111111");
@@ -88149,7 +88141,7 @@ async function fetchBankIntegrationMetadata(options) {
 
 // src/models/bank.ts
 var Bank = class _Bank {
-  constructor(address, mint, mintDecimals, group, assetShareValue, liabilityShareValue, liquidityVault, liquidityVaultBump, liquidityVaultAuthorityBump, insuranceVault, insuranceVaultBump, insuranceVaultAuthorityBump, collectedInsuranceFeesOutstanding, feeVault, feeVaultBump, feeVaultAuthorityBump, collectedGroupFeesOutstanding, lastUpdate, config, totalAssetShares, totalLiabilityShares, emissionsActiveBorrowing, emissionsActiveLending, emissionsRate, emissionsMint, emissionsRemaining, collectedProgramFeesOutstanding, oracleKey, emode, premiumTag, premiumActive, premiumActivatedAt, kaminoEmergency, rateLimiter, kaminoIntegrationAccounts, driftIntegrationAccounts, solendIntegrationAccounts, jupLendIntegrationAccounts, feesDestinationAccount, lendingPositionCount, borrowingPositionCount, tokenSymbol) {
+  constructor(address, mint, mintDecimals, group, assetShareValue, liabilityShareValue, liquidityVault, liquidityVaultBump, liquidityVaultAuthorityBump, insuranceVault, insuranceVaultBump, insuranceVaultAuthorityBump, collectedInsuranceFeesOutstanding, feeVault, feeVaultBump, feeVaultAuthorityBump, collectedGroupFeesOutstanding, lastUpdate, config, totalAssetShares, totalLiabilityShares, emissionsActiveBorrowing, emissionsActiveLending, emissionsRate, emissionsMint, emissionsRemaining, collectedProgramFeesOutstanding, oracleKey, emode, premiumTag, premiumActive, premiumActivatedAt, kaminoEmergency, rateLimiter, kaminoIntegrationAccounts, driftIntegrationAccounts, solendIntegrationAccounts, jupLendIntegrationAccounts, feesDestinationAccount, lendingPositionCount, borrowingPositionCount, tokenSymbol, stakedOracleDisabled, stakedOracleUsesOnramp, stakedIntegrationAccounts) {
     this.address = address;
     this.mint = mint;
     this.mintDecimals = mintDecimals;
@@ -88192,6 +88184,9 @@ var Bank = class _Bank {
     this.lendingPositionCount = lendingPositionCount;
     this.borrowingPositionCount = borrowingPositionCount;
     this.tokenSymbol = tokenSymbol;
+    this.stakedOracleDisabled = stakedOracleDisabled;
+    this.stakedOracleUsesOnramp = stakedOracleUsesOnramp;
+    this.stakedIntegrationAccounts = stakedIntegrationAccounts;
   }
   static async fetch(address, program, bankMetadata) {
     const data = await program.account.bank.fetch(address);
@@ -88267,7 +88262,10 @@ var Bank = class _Bank {
       bankType.feesDestinationAccount,
       bankType.lendingPositionCount,
       bankType.borrowingPositionCount,
-      bankType.tokenSymbol
+      bankType.tokenSymbol,
+      bankType.stakedOracleDisabled,
+      bankType.stakedOracleUsesOnramp,
+      bankType.stakedIntegrationAccounts
     );
   }
   static fromAccountParsed(address, accountParsed, bankMetadata) {
@@ -88314,7 +88312,10 @@ var Bank = class _Bank {
       props.feesDestinationAccount,
       props.lendingPositionCount,
       props.borrowingPositionCount,
-      props.tokenSymbol
+      props.tokenSymbol,
+      props.stakedOracleDisabled,
+      props.stakedOracleUsesOnramp,
+      props.stakedIntegrationAccounts
     );
   }
   static withEmodeWeights(bank, emodeWeights) {