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

package/dist/index.cjs

@@ -539,7 +539,7 @@ function percentToMaxSlippageU32(percent) {
       `Max slippage percent must be in (0, ${MAX_ORDER_SLIPPAGE_PERCENT}], got ${percent}`
     );
   }
-  return Math.round(percent / 100 * U32_MAX);
+  return Math.floor(percent / 100 * U32_MAX);
 }
 function maxSlippageU32ToPercent(maxSlippage) {
   return maxSlippage / U32_MAX * 100;
@@ -22696,6 +22696,10 @@ var AccountFlags = /* @__PURE__ */ ((AccountFlags2) => {
   AccountFlags2[AccountFlags2["ACCOUNT_IN_FLASHLOAN"] = 2] = "ACCOUNT_IN_FLASHLOAN";
   AccountFlags2[AccountFlags2["ACCOUNT_FLAG_DEPRECATED"] = 4] = "ACCOUNT_FLAG_DEPRECATED";
   AccountFlags2[AccountFlags2["ACCOUNT_TRANSFER_AUTHORITY_ALLOWED"] = 8] = "ACCOUNT_TRANSFER_AUTHORITY_ALLOWED";
+  AccountFlags2[AccountFlags2["ACCOUNT_IN_RECEIVERSHIP"] = 16] = "ACCOUNT_IN_RECEIVERSHIP";
+  AccountFlags2[AccountFlags2["ACCOUNT_IN_DELEVERAGE"] = 32] = "ACCOUNT_IN_DELEVERAGE";
+  AccountFlags2[AccountFlags2["ACCOUNT_FROZEN"] = 64] = "ACCOUNT_FROZEN";
+  AccountFlags2[AccountFlags2["ACCOUNT_IN_ORDER_EXECUTION"] = 128] = "ACCOUNT_IN_ORDER_EXECUTION";
   return AccountFlags2;
 })(AccountFlags || {});
 var MarginRequirementType = /* @__PURE__ */ ((MarginRequirementType5) => {
@@ -72253,7 +72257,8 @@ function parseMarginfiAccountRaw(marginfiAccountPk, accountData) {
     balances,
     accountFlags,
     emissionsDestinationAccount,
-    healthCache
+    healthCache,
+    activeOrders: accountData.activeOrders
   };
 }
 function getActiveAccountFlags(flags) {
@@ -72309,7 +72314,8 @@ function dtoToMarginfiAccount(marginfiAccountDto) {
     balances: marginfiAccountDto.balances.map(dtoToBalance),
     accountFlags: marginfiAccountDto.accountFlags,
     emissionsDestinationAccount: new web3_js.PublicKey(marginfiAccountDto.emissionsDestinationAccount),
-    healthCache: dtoToHealthCache(marginfiAccountDto.healthCache)
+    healthCache: dtoToHealthCache(marginfiAccountDto.healthCache),
+    activeOrders: marginfiAccountDto.activeOrders ?? 0
   };
 }
 function dtoToBalance(balanceDto) {
@@ -72348,7 +72354,8 @@ function marginfiAccountToDto(marginfiAccount) {
     balances: marginfiAccount.balances.map(balanceToDto),
     accountFlags: marginfiAccount.accountFlags,
     emissionsDestinationAccount: marginfiAccount.emissionsDestinationAccount.toBase58(),
-    healthCache: healthCacheToDto(marginfiAccount.healthCache)
+    healthCache: healthCacheToDto(marginfiAccount.healthCache),
+    activeOrders: marginfiAccount.activeOrders
   };
 }
 function balanceToDto(balance) {
@@ -72664,6 +72671,23 @@ function getBalanceUsdValueWithPriceBias(params) {
   });
   return { assets: assetsValue, liabilities: liabilitiesValue };
 }
+function computeOrderPairNetValue(params) {
+  const { collateral, debt } = params;
+  const { assets: collateralUsd } = getBalanceUsdValueWithPriceBias({
+    balance: collateral.balance,
+    bank: collateral.bank,
+    oraclePrice: collateral.oraclePrice,
+    marginRequirement: 2 /* Equity */,
+    assetShareValueMultiplier: collateral.assetShareValueMultiplier
+  });
+  const { liabilities: debtUsd } = getBalanceUsdValueWithPriceBias({
+    balance: debt.balance,
+    bank: debt.bank,
+    oraclePrice: debt.oraclePrice,
+    marginRequirement: 2 /* Equity */
+  });
+  return { collateralUsd, debtUsd, netUsd: collateralUsd.minus(debtUsd) };
+}
 function computeQuantity(balance, bank) {
   const assetsQuantity = getAssetQuantity(bank, balance.assetShares);
   const liabilitiesQuantity = getLiabilityQuantity(bank, balance.liabilityShares);
@@ -73467,18 +73491,31 @@ var fetchOrdersForAccount = async (program, marginfiAccount) => {
   ]);
   return orders.map(({ publicKey: publicKey5, account }) => parseOrderRaw(publicKey5, account));
 };
-var resolveOrderBanks = (marginfiAccount, order) => {
+var resolveOrderLegs = (marginfiAccount, order) => {
   const taggedBalances = marginfiAccount.balances.filter(
-    (balance) => balance.tag !== 0 && order.tags.includes(balance.tag)
+    (balance) => balance.active && balance.tag !== 0 && order.tags.includes(balance.tag)
   );
-  const collateral = taggedBalances.find((balance) => balance.assetShares.gt(0));
-  const debt = taggedBalances.find((balance) => balance.liabilityShares.gt(0));
-  if (!collateral || !debt) {
+  return {
+    collateralBank: taggedBalances.find((balance) => balance.assetShares.gt(0))?.bankPk ?? null,
+    debtBank: taggedBalances.find((balance) => balance.liabilityShares.gt(0))?.bankPk ?? null
+  };
+};
+var resolveOrderBanks = (marginfiAccount, order) => {
+  const { collateralBank, debtBank } = resolveOrderLegs(marginfiAccount, order);
+  if (!collateralBank || !debtBank) {
     throw new Error(
       `Could not resolve banks for order ${order.address.toBase58()}: tagged balances are missing or closed`
     );
   }
-  return { collateralBank: collateral.bankPk, debtBank: debt.bankPk };
+  return { collateralBank, debtBank };
+};
+var fetchOrderFees = async (program) => {
+  const [feeStateAddress] = deriveFeeState(program.programId);
+  const feeState = await program.account.feeState.fetch(feeStateAddress);
+  return {
+    placementFeeLamports: feeState.orderInitFlatSolFee,
+    executionMaxFee: wrappedI80F48toBigNumber(feeState.orderExecutionMaxFee)
+  };
 };
 function randomDistinctIndices(count, maxExclusive) {
   const chosen = /* @__PURE__ */ new Set();
@@ -78235,7 +78272,9 @@ function generateDummyAccount(group, authority, accountKey) {
       mrgnErr: 0
     },
     emissionsDestinationAccount: new web3_js.PublicKey("11111111111111111111111111111111"),
-    accountFlags: new BN8__default.default([0, 0, 0])};
+    accountFlags: new BN8__default.default([0, 0, 0]),
+    activeOrders: 0
+  };
   return parseMarginfiAccountRaw(accountKey, rawAccount);
 }
 
@@ -78346,7 +78385,7 @@ var HealthCache = class _HealthCache {
 
 // src/models/account.ts
 var MarginfiAccount = class _MarginfiAccount {
-  constructor(address, group, authority, balances, accountFlags, emissionsDestinationAccount, healthCache) {
+  constructor(address, group, authority, balances, accountFlags, emissionsDestinationAccount, healthCache, activeOrders = 0) {
     this.address = address;
     this.group = group;
     this.authority = authority;
@@ -78354,6 +78393,7 @@ var MarginfiAccount = class _MarginfiAccount {
     this.accountFlags = accountFlags;
     this.emissionsDestinationAccount = emissionsDestinationAccount;
     this.healthCache = healthCache;
+    this.activeOrders = activeOrders;
   }
   /**
    * Fetches a marginfi account from on-chain data.
@@ -78378,7 +78418,8 @@ var MarginfiAccount = class _MarginfiAccount {
       account.balances.map((b) => Balance.fromBalanceType(b)),
       account.accountFlags,
       account.emissionsDestinationAccount,
-      account.healthCache
+      account.healthCache,
+      account.activeOrders
     );
   }
   /**
@@ -78398,7 +78439,8 @@ var MarginfiAccount = class _MarginfiAccount {
       props.balances.map((b) => Balance.fromBalanceType(b)),
       props.accountFlags,
       props.emissionsDestinationAccount,
-      HealthCache.fromHealthCacheType(props.healthCache)
+      HealthCache.fromHealthCacheType(props.healthCache),
+      props.activeOrders
     );
   }
   /**
@@ -79426,7 +79468,8 @@ function projectAccountAfterFirstLeg(account, firstLegFlashloanTxs, program, ban
     projectedBalances.map((b) => Balance.fromBalanceType(b)),
     account.accountFlags,
     account.emissionsDestinationAccount,
-    account.healthCache
+    account.healthCache,
+    account.activeOrders
   );
 }
 function composeBundle(firstLegTxs, secondLegTxs, payer, blockhash, maxBundleTxs) {
@@ -85682,6 +85725,7 @@ exports.computeMaxWithdrawForBank = computeMaxWithdrawForBank;
 exports.computeNetApy = computeNetApy;
 exports.computeOracleMultiplier = computeOracleMultiplier;
 exports.computeOracleMultipliers = computeOracleMultipliers;
+exports.computeOrderPairNetValue = computeOrderPairNetValue;
 exports.computeProjectedActiveBalancesNoCpi = computeProjectedActiveBalancesNoCpi;
 exports.computeProjectedActiveBanksNoCpi = computeProjectedActiveBanksNoCpi;
 exports.computePtMultiplier = computePtMultiplier;
@@ -85757,6 +85801,7 @@ exports.fetchOracleMultipliers = fetchOracleMultipliers;
 exports.fetchOracleMultipliersFromAPI = fetchOracleMultipliersFromAPI;
 exports.fetchOracleMultipliersFromChain = fetchOracleMultipliersFromChain;
 exports.fetchOrder = fetchOrder;
+exports.fetchOrderFees = fetchOrderFees;
 exports.fetchOrdersForAccount = fetchOrdersForAccount;
 exports.fetchProgramForMints = fetchProgramForMints;
 exports.fetchPythOracleData = fetchPythOracleData;
@@ -85947,6 +85992,7 @@ exports.requireTokenProgram = requireTokenProgram;
 exports.resolveAmount = resolveAmount;
 exports.resolveBridgeCandidateBanks = resolveBridgeCandidateBanks;
 exports.resolveOrderBanks = resolveOrderBanks;
+exports.resolveOrderLegs = resolveOrderLegs;
 exports.resolvePinnedSwapRoute = resolvePinnedSwapRoute;
 exports.resolveTokenProgramForMint = resolveTokenProgramForMint;
 exports.resolveVaultTokenProgram = resolveVaultTokenProgram;