@0dotxyz/p0-ts-sdk 2.0.0-alpha.0 → 2.0.0-alpha.2

package/dist/index.cjs

@@ -13723,6 +13723,12 @@ var AccountType = /* @__PURE__ */ ((AccountType2) => {
   AccountType2["Bank"] = "bank";
   return AccountType2;
 })(AccountType || {});
+function resolveAmount(amount) {
+  if (typeof amount === "object" && amount !== null && "type" in amount && "value" in amount) {
+    return amount;
+  }
+  return { value: amount, type: "uiToken" };
+}
 
 // src/services/bank/utils/deserialize.utils.ts
 function decodeBankRaw(encoded, idl) {
@@ -17688,11 +17694,11 @@ var AccountFlags = /* @__PURE__ */ ((AccountFlags2) => {
   AccountFlags2[AccountFlags2["ACCOUNT_TRANSFER_AUTHORITY_ALLOWED"] = 8] = "ACCOUNT_TRANSFER_AUTHORITY_ALLOWED";
   return AccountFlags2;
 })(AccountFlags || {});
-var MarginRequirementType = /* @__PURE__ */ ((MarginRequirementType4) => {
-  MarginRequirementType4[MarginRequirementType4["Initial"] = 0] = "Initial";
-  MarginRequirementType4[MarginRequirementType4["Maintenance"] = 1] = "Maintenance";
-  MarginRequirementType4[MarginRequirementType4["Equity"] = 2] = "Equity";
-  return MarginRequirementType4;
+var MarginRequirementType = /* @__PURE__ */ ((MarginRequirementType5) => {
+  MarginRequirementType5[MarginRequirementType5["Initial"] = 0] = "Initial";
+  MarginRequirementType5[MarginRequirementType5["Maintenance"] = 1] = "Maintenance";
+  MarginRequirementType5[MarginRequirementType5["Equity"] = 2] = "Equity";
+  return MarginRequirementType5;
 })(MarginRequirementType || {});
 
 // src/services/account/types/simulation.types.ts
@@ -17912,6 +17918,47 @@ function healthCacheToDto(healthCache) {
     simulationStatus: healthCache.simulationStatus
   };
 }
+function getEmodePairs(banks) {
+  const emodePairs = [];
+  banks.forEach((bank) => {
+    const emodeTag = bank.emode.emodeTag;
+    if (emodeTag === 0 /* UNSET */) {
+      return;
+    }
+    bank.emode.emodeEntries.forEach((emodeEntry) => {
+      emodePairs.push({
+        collateralBanks: banks.filter((b) => b.emode.emodeTag === emodeEntry.collateralBankEmodeTag).map((b) => b.address),
+        collateralBankTag: emodeEntry.collateralBankEmodeTag,
+        liabilityBank: bank.address,
+        liabilityBankTag: emodeTag,
+        assetWeightMaint: emodeEntry.assetWeightMaint,
+        assetWeightInit: emodeEntry.assetWeightInit
+      });
+    });
+  });
+  return emodePairs;
+}
+function computeLowestEmodeWeights(emodePairs) {
+  const result = /* @__PURE__ */ new Map();
+  emodePairs.forEach((emodePair) => {
+    emodePair.collateralBanks.forEach((collateralBankPk) => {
+      const bankPkStr = collateralBankPk.toBase58();
+      const existing = result.get(bankPkStr);
+      if (!existing) {
+        result.set(bankPkStr, {
+          assetWeightInit: emodePair.assetWeightInit,
+          assetWeightMaint: emodePair.assetWeightMaint
+        });
+      } else {
+        result.set(bankPkStr, {
+          assetWeightInit: BigNumber4__default.default.min(existing.assetWeightInit, emodePair.assetWeightInit),
+          assetWeightMaint: BigNumber4__default.default.min(existing.assetWeightMaint, emodePair.assetWeightMaint)
+        });
+      }
+    });
+  });
+  return result;
+}
 function createActiveEmodePairFromPairs(pairs) {
   if (pairs.length === 0) {
     return void 0;
@@ -17928,28 +17975,20 @@ function createActiveEmodePairFromPairs(pairs) {
         pairs.map((p) => p.collateralBanks).flat().map((bank) => [bank.toBase58(), bank])
       ).values()
     ),
-    collateralBankTags: Array.from(
-      new Set(pairs.map((p) => p.collateralBankTag).flat())
-    ),
+    collateralBankTags: Array.from(new Set(pairs.map((p) => p.collateralBankTag).flat())),
     liabilityBanks: Array.from(
       new Map(
         pairs.map((p) => p.liabilityBank).flat().map((bank) => [bank.toBase58(), bank])
       ).values()
     ),
-    liabilityBankTags: Array.from(
-      new Set(pairs.map((p) => p.liabilityBankTag).flat())
-    ),
+    liabilityBankTags: Array.from(new Set(pairs.map((p) => p.liabilityBankTag).flat())),
     assetWeightMaint: bestPair.assetWeightMaint,
     assetWeightInit: bestPair.assetWeightInit
   };
 }
 function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, allBanks) {
   const toKey = (k) => k.toBase58();
-  const basePairs = computeActiveEmodePairs(
-    emodePairs,
-    activeLiabilities,
-    activeCollateral
-  );
+  const basePairs = computeActiveEmodePairs(emodePairs, activeLiabilities, activeCollateral);
   const baseOn = basePairs.length > 0;
   const liabTagMap = /* @__PURE__ */ new Map();
   for (const p of emodePairs) {
@@ -17974,9 +18013,7 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
     return 1 /* ExtendEmode */;
   }
   function simulate(bank, action) {
-    bank.equals(
-      new web3_js.PublicKey("CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh")
-    );
+    bank.equals(new web3_js.PublicKey("CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh"));
     let L = [...activeLiabilities], C = [...activeCollateral];
     switch (action) {
       case "borrow":
@@ -18036,9 +18073,7 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
     if (!activeCollateral.some((x) => x.equals(bank))) {
       impact.borrowImpact = simulate(bank, "borrow");
     }
-    const collSet = new Set(
-      emodePairs.flatMap((p) => p.collateralBanks.map((c) => c.toBase58()))
-    );
+    const collSet = new Set(emodePairs.flatMap((p) => p.collateralBanks.map((c) => c.toBase58())));
     if (collSet.has(key) && !activeCollateral.some((x) => x.equals(bank)) && !activeLiabilities.some((x) => x.equals(bank))) {
       impact.supplyImpact = simulate(bank, "supply");
     }
@@ -18058,10 +18093,7 @@ function computeActiveEmodePairs(emodePairs, activeLiabilities, activeCollateral
   );
   const liabTagByBank = /* @__PURE__ */ new Map();
   for (const p of configured) {
-    liabTagByBank.set(
-      p.liabilityBank.toBase58(),
-      p.liabilityBankTag.toString()
-    );
+    liabTagByBank.set(p.liabilityBank.toBase58(), p.liabilityBankTag.toString());
   }
   const requiredTags = /* @__PURE__ */ new Set();
   for (const liab of activeLiabilities) {
@@ -42040,7 +42072,7 @@ async function makeKaminoWithdrawIx3({
   bank,
   bankMap,
   tokenProgram,
-  amount,
+  cTokenAmount,
   marginfiAccount,
   reserve,
   authority,
@@ -42109,7 +42141,7 @@ async function makeKaminoWithdrawIx3({
       reserveFarmState: reserveFarm
     },
     {
-      amount: uiToNative(amount, bank.mintDecimals),
+      amount: uiToNative(cTokenAmount, bank.mintDecimals),
       isFinalWithdrawal: withdrawAll
     },
     remainingAccounts.map((account) => ({
@@ -42136,7 +42168,7 @@ async function makeKaminoWithdrawIx3({
       group: opts.overrideInferAccounts?.group ?? marginfiAccount.group
     },
     {
-      amount: uiToNative(amount, bank.mintDecimals),
+      amount: uiToNative(cTokenAmount, bank.mintDecimals),
       isFinalWithdrawal: withdrawAll
     },
     remainingAccounts.map((account) => ({
@@ -42310,11 +42342,13 @@ async function makeWithdrawTx(params) {
   return { transactions, actionTxIndex: transactions.length - 1 };
 }
 async function makeKaminoWithdrawTx(params) {
-  const { luts, connection, amount, ...withdrawIxParams } = params;
+  const { luts, connection, amount, assetShareValueMultiplierByBank, ...withdrawIxParams } = params;
   if (!withdrawIxParams.bank.kaminoIntegrationAccounts) {
     throw new Error("Bank has no kamino integration accounts");
   }
-  const adjustedAmount = new BigNumber4.BigNumber(amount).div(withdrawIxParams.bank.assetShareValue).toNumber();
+  const { value: amountValue, type: amountType } = resolveAmount(amount);
+  const multiplier = assetShareValueMultiplierByBank.get(withdrawIxParams.bank.address.toBase58()) ?? new BigNumber4.BigNumber(1);
+  const adjustedAmount = amountType === "cToken" ? new BigNumber4.BigNumber(amountValue).toNumber() : new BigNumber4.BigNumber(amountValue).div(multiplier).toNumber();
   const refreshIxs = makeRefreshKaminoBanksIxs(
     params.marginfiAccount,
     params.bankMap,
@@ -42328,7 +42362,7 @@ async function makeKaminoWithdrawTx(params) {
     params.bankMetadataMap
   );
   const withdrawIxs = await makeKaminoWithdrawIx3({
-    amount: adjustedAmount,
+    cTokenAmount: adjustedAmount,
     ...withdrawIxParams
   });
   const { instructions: updateFeedIxs, luts: feedLuts } = await makeSmartCrankSwbFeedIx({
@@ -43427,6 +43461,7 @@ async function buildRepayWithCollatFlashloanTx({
   withdrawOpts,
   repayOpts,
   bankMetadataMap,
+  assetShareValueMultiplierByBank,
   addressLookupTableAccounts,
   connection,
   swapOpts,
@@ -43499,13 +43534,14 @@ async function buildRepayWithCollatFlashloanTx({
           withdrawOpts.withdrawBank.tokenSymbol
         );
       }
-      const adjustedAmount = new BigNumber4.BigNumber(withdrawOpts.withdrawAmount).div(withdrawOpts.withdrawBank.assetShareValue).times(1.0001).toNumber();
+      const multiplier = assetShareValueMultiplierByBank.get(withdrawOpts.withdrawBank.address.toBase58()) ?? new BigNumber4.BigNumber(1);
+      const adjustedAmount = new BigNumber4.BigNumber(withdrawOpts.withdrawAmount).div(multiplier).times(1.0001).toNumber();
       withdrawIxs = await makeKaminoWithdrawIx3({
         program,
         bank: withdrawOpts.withdrawBank,
         bankMap,
         tokenProgram: withdrawOpts.tokenProgram,
-        amount: adjustedAmount,
+        cTokenAmount: adjustedAmount,
         marginfiAccount,
         authority: marginfiAccount.authority,
         reserve,
@@ -43798,6 +43834,7 @@ async function buildSwapCollateralFlashloanTx({
   depositOpts,
   swapOpts,
   bankMetadataMap,
+  assetShareValueMultiplierByBank,
   addressLookupTableAccounts,
   connection,
   overrideInferAccounts,
@@ -43835,13 +43872,14 @@ async function buildSwapCollateralFlashloanTx({
           withdrawOpts.withdrawBank.tokenSymbol
         );
       }
-      const adjustedAmount = new BigNumber4.BigNumber(actualWithdrawAmount).div(withdrawOpts.withdrawBank.assetShareValue).times(1.0001).toNumber();
+      const multiplier = assetShareValueMultiplierByBank.get(withdrawOpts.withdrawBank.address.toBase58()) ?? new BigNumber4.BigNumber(1);
+      const adjustedAmount = new BigNumber4.BigNumber(actualWithdrawAmount).div(multiplier).times(1.0001).toNumber();
       withdrawIxs = await makeKaminoWithdrawIx3({
         program,
         bank: withdrawBank,
         bankMap,
         tokenProgram: withdrawTokenProgram,
-        amount: adjustedAmount,
+        cTokenAmount: adjustedAmount,
         marginfiAccount,
         authority: marginfiAccount.authority,
         reserve,
@@ -44853,7 +44891,7 @@ function computeMaxBorrowForBank(params) {
   });
   const liabWeight = getLiabilityWeight(bank.config, 0 /* Initial */);
   if (assetWeight.eq(0)) {
-    return computeQuantityUi(balance, bank).assets.plus(
+    return computeQuantityUi(balance, bank, assetShareValueMultiplier).assets.plus(
       freeCollateral.minus(untiedCollateralForBank).div(priceHighestBias.times(liabWeight))
     );
   } else {
@@ -45303,7 +45341,9 @@ async function computeSmartCrank({
   };
 }
 async function makeSmartCrankSwbFeedIx(params) {
+  console.log("[makeSmartCrankSwbFeedIx] Called");
   const crankResult = await computeSmartCrank(params);
+  console.log("[makeSmartCrankSwbFeedIx] Crank result:", crankResult);
   if (crankResult.uncrankableLiabilities.length > 0) {
     console.log(
       "Uncrankable liability details:",
@@ -45339,6 +45379,7 @@ async function makeSmartCrankSwbFeedIx(params) {
     );
   }
   const oraclesToCrank = crankResult.requiredOracles;
+  console.log("[makeSmartCrankSwbFeedIx] Oracles to crank:", oraclesToCrank);
   const { instructions: instructions2, luts } = await makeUpdateSwbFeedIx({
     swbPullOracles: oraclesToCrank,
     feePayer: params.marginfiAccount.authority,
@@ -45375,6 +45416,9 @@ async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider
   }
 }
 async function makeUpdateSwbFeedIx(props) {
+  console.log(
+    `[makeUpdateSwbFeedIx] Called with ${props.swbPullOracles.length} oracles, feePayer: ${props.feePayer.toBase58()}`
+  );
   const seen = /* @__PURE__ */ new Set();
   const uniqueOracles = props.swbPullOracles.filter((oracle) => {
     const key = oracle.key.toBase58();
@@ -45382,21 +45426,21 @@ async function makeUpdateSwbFeedIx(props) {
     seen.add(key);
     return true;
   });
+  console.log(
+    `[makeUpdateSwbFeedIx] ${uniqueOracles.length} unique oracles after dedup (removed ${props.swbPullOracles.length - uniqueOracles.length})`
+  );
+  uniqueOracles.forEach(
+    (o) => console.log(
+      `[makeUpdateSwbFeedIx]   - ${o.key.toBase58()} (hasSwitchboardData: ${!!o.price?.switchboardData})`
+    )
+  );
   const swbProgram = await onDemand.AnchorUtils.loadProgramFromConnection(props.connection);
   const pullFeedInstances = uniqueOracles.map((oracle) => {
     const pullFeed = new onDemand.PullFeed(swbProgram, oracle.key);
-    if (oracle.price?.switchboardData) {
-      const swbData = oracle.price?.switchboardData;
-      pullFeed.data = {
-        queue: new web3_js.PublicKey(swbData.queue),
-        feedHash: new Uint8Array(Buffer.from(swbData.feedHash, "hex")),
-        maxVariance: new BN11.BN(swbData.maxVariance),
-        minResponses: swbData.minResponses
-      };
-    }
     return pullFeed;
   });
   if (pullFeedInstances.length === 0) {
+    console.log(`[makeUpdateSwbFeedIx] No pull feed instances, returning early`);
     return { instructions: [], luts: [] };
   }
   const crossbarClient = new common.CrossbarClient(
@@ -45418,6 +45462,7 @@ async function makeUpdateSwbFeedIx(props) {
     payer: props.feePayer,
     crossbarClient
   });
+  console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
   return { instructions: pullIx, luts };
 }
 
@@ -49034,6 +49079,30 @@ var MarginfiAccountWrapper = class {
     });
   }
   // ----------------------------------------------------------------------------
+  // E-mode state — derived from client.emodePairs + account balances
+  // ----------------------------------------------------------------------------
+  /**
+   * Returns the active emode pairs for this account based on current positions.
+   */
+  getActiveEmodePairs() {
+    return this.account.computeActiveEmodePairs(this.client.emodePairs);
+  }
+  /**
+   * Returns the lowest emode weights per collateral bank for currently active pairs.
+   * Keyed by bank address string → { assetWeightInit, assetWeightMaint }.
+   */
+  getActiveEmodeWeightsByBank() {
+    const activePairs = this.getActiveEmodePairs();
+    return computeLowestEmodeWeights(activePairs);
+  }
+  /**
+   * Computes emode impacts for all banks using the client's emode pairs.
+   */
+  getEmodeImpacts() {
+    const bankAddresses = this.client.banks.map((b) => b.address);
+    return this.account.computeEmodeImpacts(this.client.emodePairs, bankAddresses);
+  }
+  // ----------------------------------------------------------------------------
   // Computation methods with auto-injected client data
   // ----------------------------------------------------------------------------
   /**
@@ -49046,8 +49115,7 @@ var MarginfiAccountWrapper = class {
       oraclePricesByBank: this.client.oraclePriceByBank,
       bankIntegrationMap: this.client.bankIntegrationMap,
       assetShareValueMultiplierByBank: this.client.assetShareValueMultiplierByBank,
-      activeEmodeWeightsByBank: /* @__PURE__ */ new Map()
-      // TODO
+      activeEmodeWeightsByBank: this.getActiveEmodeWeightsByBank()
     });
   }
   /**
@@ -49058,8 +49126,7 @@ var MarginfiAccountWrapper = class {
       banksMap: this.client.bankMap,
       oraclePricesByBank: this.client.oraclePriceByBank,
       assetShareValueMultiplierByBank: this.client.assetShareValueMultiplierByBank,
-      activeEmodeWeightsByBank: /* @__PURE__ */ new Map()
-      // TODO
+      activeEmodeWeightsByBank: this.getActiveEmodeWeightsByBank()
     });
   }
   /**
@@ -49091,15 +49158,17 @@ var MarginfiAccountWrapper = class {
    * @param opts - Optional configuration for emode and volatility
    */
   computeMaxBorrowForBank(bankAddress, opts) {
+    const bankKey = bankAddress.toBase58();
+    const emodeImpacts = this.getEmodeImpacts();
+    const bankImpact = emodeImpacts[bankKey];
+    const borrowImpact = bankImpact?.borrowImpact;
     return this.account.computeMaxBorrowForBank({
       banksMap: this.client.bankMap,
       oraclePricesByBank: this.client.oraclePriceByBank,
       bankAddress,
       assetShareValueMultiplierByBank: this.client.assetShareValueMultiplierByBank,
-      emodeImpactStatus: void 0,
-      // TODO
-      activePair: void 0,
-      // TODO
+      emodeImpactStatus: borrowImpact?.status,
+      activePair: borrowImpact?.activePair,
       volatilityFactor: opts?.volatilityFactor
     });
   }
@@ -49110,18 +49179,20 @@ var MarginfiAccountWrapper = class {
    * @param opts - Optional configuration for volatility and emode
    */
   computeMaxWithdrawForBank(bankAddress, opts) {
+    const activePairs = this.getActiveEmodePairs();
+    const activePair = activePairs.length > 0 ? createActiveEmodePairFromPairs(activePairs) : void 0;
     return this.account.computeMaxWithdrawForBank({
       banksMap: this.client.bankMap,
       oraclePricesByBank: this.client.oraclePriceByBank,
       bankAddress,
       assetShareValueMultiplierByBank: this.client.assetShareValueMultiplierByBank,
-      activePair: void 0,
-      // TODO
+      activePair,
       volatilityFactor: opts?.volatilityFactor
     });
   }
   /**
-   * Computes active emode pairs.
+   * Computes active emode pairs for custom emode pair sets.
+   * For typical usage, prefer `getActiveEmodePairs()` which uses client data.
    *
    * @param emodePairs - All available emode pairs
    */
@@ -49129,7 +49200,8 @@ var MarginfiAccountWrapper = class {
     return this.account.computeActiveEmodePairs(emodePairs);
   }
   /**
-   * Computes emode impacts.
+   * Computes emode impacts for custom emode pair sets.
+   * For typical usage, prefer `getEmodeImpacts()` which uses client data.
    *
    * @param emodePairs - All available emode pairs
    * @param banks - Array of bank addresses to analyze
@@ -49164,7 +49236,7 @@ var MarginfiAccountWrapper = class {
   }
 };
 var Project0Client = class _Project0Client {
-  constructor(program, group, bankMap, bankIntegrationMap, assetShareValueMultiplierByBank, oraclePriceByBank, mintDataByBank, addressLookupTables) {
+  constructor(program, group, bankMap, bankIntegrationMap, assetShareValueMultiplierByBank, oraclePriceByBank, mintDataByBank, addressLookupTables, emodePairs) {
     this.program = program;
     this.group = group;
     this.bankMap = bankMap;
@@ -49173,6 +49245,7 @@ var Project0Client = class _Project0Client {
     this.oraclePriceByBank = oraclePriceByBank;
     this.mintDataByBank = mintDataByBank;
     this.addressLookupTables = addressLookupTables;
+    this.emodePairs = emodePairs;
   }
   /**
    * Gets all banks as an array.
@@ -49293,11 +49366,15 @@ var Project0Client = class _Project0Client {
     );
     if (!skipHealthCache) {
       const bankMap = new Map(this.banks.map((b) => [b.address.toBase58(), b]));
+      const activePairs = marginfiAccountParsed.computeActiveEmodePairs(this.emodePairs);
+      const activeEmodeWeightsByBank = computeLowestEmodeWeights(activePairs);
       const { account: simulatedAccount } = await marginfiAccountParsed.simulateHealthCache({
         program: this.program,
         banksMap: bankMap,
         oraclePricesByBank: this.oraclePriceByBank,
-        bankIntegrationMap: this.bankIntegrationMap
+        bankIntegrationMap: this.bankIntegrationMap,
+        assetShareValueMultiplierByBank: this.assetShareValueMultiplierByBank,
+        activeEmodeWeightsByBank
       });
       marginfiAccountParsed = simulatedAccount;
     }
@@ -49394,6 +49471,7 @@ var Project0Client = class _Project0Client {
           break;
       }
     });
+    const emodePairs = getEmodePairs(banksArray);
     return new _Project0Client(
       program,
       group,
@@ -49402,7 +49480,8 @@ var Project0Client = class _Project0Client {
       assetShareMultiplierByBank,
       bankOraclePriceMap,
       mintDataByBank,
-      addressLookupTables
+      addressLookupTables,
+      emodePairs
     );
   }
 };
@@ -49557,6 +49636,7 @@ exports.computeLiabilityHealthComponent = computeLiabilityHealthComponent;
 exports.computeLiabilityUsdValue = computeLiabilityUsdValue;
 exports.computeLiquidationPriceForBank = computeLiquidationPriceForBank;
 exports.computeLoopingParams = computeLoopingParams;
+exports.computeLowestEmodeWeights = computeLowestEmodeWeights;
 exports.computeMaxBorrowForBank = computeMaxBorrowForBank;
 exports.computeMaxLeverage = computeMaxLeverage;
 exports.computeMaxWithdrawForBank = computeMaxWithdrawForBank;
@@ -49645,6 +49725,7 @@ exports.getConfig = getConfig;
 exports.getDriftCTokenMultiplier = getDriftCTokenMultiplier;
 exports.getDriftMetadata = getDriftMetadata;
 exports.getDriftStatesDto = getDriftStatesDto;
+exports.getEmodePairs = getEmodePairs;
 exports.getHealthCacheStatusDescription = getHealthCacheStatusDescription;
 exports.getHealthSimulationTransactions = getHealthSimulationTransactions;
 exports.getJupiterSwapIxsForFlashloan = getJupiterSwapIxsForFlashloan;
@@ -49736,6 +49817,7 @@ exports.parseRiskTier = parseRiskTier;
 exports.parseRpcPythPriceData = parseRpcPythPriceData;
 exports.parseSwbOraclePriceData = parseSwbOraclePriceData;
 exports.partitionBanksByCrankability = partitionBanksByCrankability;
+exports.resolveAmount = resolveAmount;
 exports.serializeBankConfigOpt = serializeBankConfigOpt;
 exports.serializeInterestRateConfig = serializeInterestRateConfig;
 exports.serializeOperationalState = serializeOperationalState;