@0dotxyz/p0-ts-sdk 2.1.2 → 2.1.4

package/dist/index.cjs

@@ -16070,7 +16070,7 @@ function parseEmodeSettingsRaw(emodeSettingsRaw) {
   };
   return emodeSettings;
 }
-function parseBankRaw(address, accountParsed, bankMetadata, mintData) {
+function parseBankRaw(address, accountParsed, bankMetadata) {
   const flags = accountParsed.flags.toNumber();
   const mint = accountParsed.mint;
   const mintDecimals = accountParsed.mintDecimals;
@@ -16169,8 +16169,6 @@ function parseBankRaw(address, accountParsed, bankMetadata, mintData) {
     borrowingPositionCount,
     emode,
     tokenSymbol,
-    mintRate: mintData?.mintRate ?? null,
-    mintPrice: mintData?.mintPrice ?? 0,
     kaminoIntegrationAccounts,
     driftIntegrationAccounts,
     solendIntegrationAccounts,
@@ -16211,9 +16209,6 @@ function dtoToBank(bankDto) {
     feesDestinationAccount: bankDto.feesDestinationAccount ? new web3_js.PublicKey(bankDto.feesDestinationAccount) : void 0,
     lendingPositionCount: bankDto.lendingPositionCount ? new BigNumber3__default.default(bankDto.lendingPositionCount) : void 0,
     borrowingPositionCount: bankDto.borrowingPositionCount ? new BigNumber3__default.default(bankDto.borrowingPositionCount) : void 0,
-    mintRate: null,
-    // TODO: move these out
-    mintPrice: 0,
     kaminoIntegrationAccounts: bankDto.kaminoIntegrationAccounts ? {
       kaminoReserve: new web3_js.PublicKey(bankDto.kaminoIntegrationAccounts.kaminoReserve),
       kaminoObligation: new web3_js.PublicKey(bankDto.kaminoIntegrationAccounts.kaminoObligation)
@@ -43825,7 +43820,7 @@ var SEED_RESERVE = "reserve";
 var SEED_RATE_MODEL = "rate_model";
 var SEED_USER_SUPPLY_POSITION = "user_supply_position";
 var SEED_LENDING_REWARDS_RATE_MODEL = "lending_rewards_rate_model";
-function getAllDerivedJupLendAccounts(mint) {
+function getAllDerivedJupLendAccounts(mint, tokenProgram) {
   const [fTokenMint] = deriveJupLendFTokenMint(mint);
   const [lending] = deriveJupLendLending(mint, fTokenMint);
   const [liquidity] = deriveJupLendLiquidity();
@@ -43835,7 +43830,7 @@ function getAllDerivedJupLendAccounts(mint) {
     supplyTokenReservesLiquidity: deriveJupLendTokenReserve(mint)[0],
     lendingSupplyPositionOnLiquidity: deriveJupLendLiquiditySupplyPositionPda(mint, lending)[0],
     rateModel: deriveJupLendRateModel(mint)[0],
-    vault: deriveJupLendLiquidityVaultAta(mint, liquidity),
+    vault: deriveJupLendLiquidityVaultAta(mint, liquidity, tokenProgram),
     liquidity,
     rewardsRateModel: deriveJupLendLendingRewardsRateModel(mint)[0]
   };
@@ -45575,7 +45570,7 @@ async function makeJuplendWithdrawIx2({
     lendingAdmin,
     rateModel,
     vault,
-    liquidity} = getAllDerivedJupLendAccounts(bank.mint);
+    liquidity} = getAllDerivedJupLendAccounts(bank.mint, tokenProgram);
   if (opts.observationBanksOverride) {
     remainingAccounts.push(...opts.observationBanksOverride);
   } else {
@@ -46198,7 +46193,7 @@ async function makeJuplendDepositIx2({
   if (!bank.jupLendIntegrationAccounts) {
     throw new Error("Bank has no JupLend integration accounts");
   }
-  const derivedAccounts = getAllDerivedJupLendAccounts(bank.mint);
+  const derivedAccounts = getAllDerivedJupLendAccounts(bank.mint, tokenProgram);
   const {
     fTokenMint,
     lendingAdmin,
@@ -50887,13 +50882,11 @@ async function fetchBankIntegrationMetadata(options) {
   return bankIntegrationMap;
 }
 var Bank = class _Bank {
-  constructor(address, mint, mintDecimals, group, mintRate, mintPrice, assetShareValue, liabilityShareValue, liquidityVault, liquidityVaultBump, liquidityVaultAuthorityBump, insuranceVault, insuranceVaultBump, insuranceVaultAuthorityBump, collectedInsuranceFeesOutstanding, feeVault, feeVaultBump, feeVaultAuthorityBump, collectedGroupFeesOutstanding, lastUpdate, config, totalAssetShares, totalLiabilityShares, emissionsActiveBorrowing, emissionsActiveLending, emissionsRate, emissionsMint, emissionsRemaining, oracleKey, emode, 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, oracleKey, emode, kaminoIntegrationAccounts, driftIntegrationAccounts, solendIntegrationAccounts, jupLendIntegrationAccounts, feesDestinationAccount, lendingPositionCount, borrowingPositionCount, tokenSymbol) {
     this.address = address;
     this.mint = mint;
     this.mintDecimals = mintDecimals;
     this.group = group;
-    this.mintRate = mintRate;
-    this.mintPrice = mintPrice;
     this.assetShareValue = assetShareValue;
     this.liabilityShareValue = liabilityShareValue;
     this.liquidityVault = liquidityVault;
@@ -50963,8 +50956,6 @@ var Bank = class _Bank {
       bankType.mint,
       bankType.mintDecimals,
       bankType.group,
-      bankType.mintRate,
-      bankType.mintPrice,
       bankType.assetShareValue,
       bankType.liabilityShareValue,
       bankType.liquidityVault,
@@ -51006,8 +50997,6 @@ var Bank = class _Bank {
       props.mint,
       props.mintDecimals,
       props.group,
-      props.mintRate,
-      props.mintPrice,
       props.assetShareValue,
       props.liabilityShareValue,
       props.liquidityVault,