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

package/dist/{dto-rate-model.types-AQ40wS-P.d.cts → dto-rate-model.types-DveIB9Ll.d.cts}

@@ -1723,4 +1723,4 @@ interface JupRateModelJSON {
     rateAtKink2: number;
 }
 
-export { type ScopeConfigurationJSON as $, type ReserveConfigFields as A, type ReserveFeesFields as B, type CurvePointFields as C, type DriftSpotMarket as D, type BorrowRateCurveFields as E, type FarmStateJSON as F, type PriceHeuristicFields as G, type HistoricalOracleData as H, type InsuranceFund as I, type JupLendingState as J, type ScopeConfigurationFields as K, type SwitchboardConfigurationFields as L, type PythConfigurationFields as M, type ReserveLiquidityJSON as N, type ObligationJSON as O, type PoolBalance as P, type ReserveCollateralJSON as Q, type ReserveRaw as R, type SpotPosition as S, type TokenInfoFields$1 as T, type ReserveConfigJSON as U, type ReserveFeesJSON as V, type WithdrawalCapsFields as W, type BorrowRateCurveJSON as X, type CurvePointJSON as Y, type TokenInfoJSON$1 as Z, type PriceHeuristicJSON as _, type DriftRewards as a, type SwitchboardConfigurationJSON as a0, type PythConfigurationJSON as a1, type WithdrawalCapsJSON as a2, type ObligationLiquidityJSON as a3, type ObligationCollateralJSON as a4, type ObligationOrderJSON as a5, type ObligationCollateralFields as a6, type ObligationLiquidityFields as a7, type ObligationOrderFields as a8, type LastUpdateFields as a9, type BigFractionBytesFields as aa, type LastUpdateJSON as ab, type BigFractionBytesJSON as ac, type RewardPerTimeUnitPointFields as ad, type RewardScheduleCurveFields as ae, type RewardScheduleCurveJSON as af, type RewardPerTimeUnitPointJSON as ag, type UserFeesJSON as ah, type UserFeesFields as ai, isSpotBalanceTypeVariant as aj, type FeeTier as ak, type FeeTierJSON as al, type OrderFillerRewardStructure as am, type OrderFillerRewardStructureJSON as an, type PriceDivergenceGuardRails as ao, type PriceDivergenceGuardRailsJSON as ap, type ValidityGuardRails as aq, type ValidityGuardRailsJSON as ar, type HistoricalOracleDataJSON as as, type HistoricalIndexDataJSON as at, type PoolBalanceJSON as au, type InsuranceFundJSON as av, SpotBalanceType as aw, type SpotPositionJSON as ax, type ReserveJSON as b, type ObligationRaw as c, type FarmStateRaw as d, type DriftSpotMarketJSON as e, type DriftUserJSON as f, type DriftRewardsJSON as g, type DriftUserStatsJSON as h, type DriftUser as i, type DriftUserStats as j, type JupLendingStateJSON as k, type JupTokenReserveJSON as l, type JupLendingRewardsRateModelJSON as m, type JupRateModelJSON as n, type JupTokenReserve as o, type JupLendingRewardsRateModel as p, type JupRateModel as q, type RewardInfoFields as r, type HistoricalIndexData as s, type FeeStructureJSON as t, type OracleGuardRailsJSON as u, type FeeStructure as v, type OracleGuardRails as w, DriftSpotBalanceType as x, type ReserveLiquidityFields as y, type ReserveCollateralFields as z };
+export { type ScopeConfigurationJSON as $, type ReserveConfigFields as A, type ReserveFeesFields as B, type CurvePointFields as C, type DriftSpotMarket as D, type BorrowRateCurveFields as E, type FarmStateRaw as F, type PriceHeuristicFields as G, type HistoricalOracleData as H, type InsuranceFund as I, type JupLendingState as J, type ScopeConfigurationFields as K, type SwitchboardConfigurationFields as L, type PythConfigurationFields as M, type ReserveLiquidityJSON as N, type ObligationRaw as O, type PoolBalance as P, type ReserveCollateralJSON as Q, type ReserveRaw as R, type SpotPosition as S, type TokenInfoFields$1 as T, type ReserveConfigJSON as U, type ReserveFeesJSON as V, type WithdrawalCapsFields as W, type BorrowRateCurveJSON as X, type CurvePointJSON as Y, type TokenInfoJSON$1 as Z, type PriceHeuristicJSON as _, type DriftUser as a, type SwitchboardConfigurationJSON as a0, type PythConfigurationJSON as a1, type WithdrawalCapsJSON as a2, type ObligationLiquidityJSON as a3, type ObligationCollateralJSON as a4, type ObligationOrderJSON as a5, type ObligationCollateralFields as a6, type ObligationLiquidityFields as a7, type ObligationOrderFields as a8, type LastUpdateFields as a9, type BigFractionBytesFields as aa, type LastUpdateJSON as ab, type BigFractionBytesJSON as ac, type RewardPerTimeUnitPointFields as ad, type RewardScheduleCurveFields as ae, type RewardScheduleCurveJSON as af, type RewardPerTimeUnitPointJSON as ag, type UserFeesJSON as ah, type UserFeesFields as ai, isSpotBalanceTypeVariant as aj, type FeeTier as ak, type FeeTierJSON as al, type OrderFillerRewardStructure as am, type OrderFillerRewardStructureJSON as an, type PriceDivergenceGuardRails as ao, type PriceDivergenceGuardRailsJSON as ap, type ValidityGuardRails as aq, type ValidityGuardRailsJSON as ar, type HistoricalOracleDataJSON as as, type HistoricalIndexDataJSON as at, type PoolBalanceJSON as au, type InsuranceFundJSON as av, SpotBalanceType as aw, type SpotPositionJSON as ax, type DriftRewards as b, type DriftUserStats as c, type JupTokenReserve as d, type JupLendingRewardsRateModel as e, type JupRateModel as f, type ReserveJSON as g, type ObligationJSON as h, type FarmStateJSON as i, type DriftSpotMarketJSON as j, type DriftUserJSON as k, type DriftRewardsJSON as l, type DriftUserStatsJSON as m, type JupLendingStateJSON as n, type JupTokenReserveJSON as o, type JupLendingRewardsRateModelJSON as p, type JupRateModelJSON as q, type RewardInfoFields as r, type HistoricalIndexData as s, type FeeStructureJSON as t, type OracleGuardRailsJSON as u, type FeeStructure as v, type OracleGuardRails as w, DriftSpotBalanceType as x, type ReserveLiquidityFields as y, type ReserveCollateralFields as z };

package/dist/{dto-rate-model.types-AQ40wS-P.d.ts → dto-rate-model.types-DveIB9Ll.d.ts}

@@ -1723,4 +1723,4 @@ interface JupRateModelJSON {
     rateAtKink2: number;
 }
 
-export { type ScopeConfigurationJSON as $, type ReserveConfigFields as A, type ReserveFeesFields as B, type CurvePointFields as C, type DriftSpotMarket as D, type BorrowRateCurveFields as E, type FarmStateJSON as F, type PriceHeuristicFields as G, type HistoricalOracleData as H, type InsuranceFund as I, type JupLendingState as J, type ScopeConfigurationFields as K, type SwitchboardConfigurationFields as L, type PythConfigurationFields as M, type ReserveLiquidityJSON as N, type ObligationJSON as O, type PoolBalance as P, type ReserveCollateralJSON as Q, type ReserveRaw as R, type SpotPosition as S, type TokenInfoFields$1 as T, type ReserveConfigJSON as U, type ReserveFeesJSON as V, type WithdrawalCapsFields as W, type BorrowRateCurveJSON as X, type CurvePointJSON as Y, type TokenInfoJSON$1 as Z, type PriceHeuristicJSON as _, type DriftRewards as a, type SwitchboardConfigurationJSON as a0, type PythConfigurationJSON as a1, type WithdrawalCapsJSON as a2, type ObligationLiquidityJSON as a3, type ObligationCollateralJSON as a4, type ObligationOrderJSON as a5, type ObligationCollateralFields as a6, type ObligationLiquidityFields as a7, type ObligationOrderFields as a8, type LastUpdateFields as a9, type BigFractionBytesFields as aa, type LastUpdateJSON as ab, type BigFractionBytesJSON as ac, type RewardPerTimeUnitPointFields as ad, type RewardScheduleCurveFields as ae, type RewardScheduleCurveJSON as af, type RewardPerTimeUnitPointJSON as ag, type UserFeesJSON as ah, type UserFeesFields as ai, isSpotBalanceTypeVariant as aj, type FeeTier as ak, type FeeTierJSON as al, type OrderFillerRewardStructure as am, type OrderFillerRewardStructureJSON as an, type PriceDivergenceGuardRails as ao, type PriceDivergenceGuardRailsJSON as ap, type ValidityGuardRails as aq, type ValidityGuardRailsJSON as ar, type HistoricalOracleDataJSON as as, type HistoricalIndexDataJSON as at, type PoolBalanceJSON as au, type InsuranceFundJSON as av, SpotBalanceType as aw, type SpotPositionJSON as ax, type ReserveJSON as b, type ObligationRaw as c, type FarmStateRaw as d, type DriftSpotMarketJSON as e, type DriftUserJSON as f, type DriftRewardsJSON as g, type DriftUserStatsJSON as h, type DriftUser as i, type DriftUserStats as j, type JupLendingStateJSON as k, type JupTokenReserveJSON as l, type JupLendingRewardsRateModelJSON as m, type JupRateModelJSON as n, type JupTokenReserve as o, type JupLendingRewardsRateModel as p, type JupRateModel as q, type RewardInfoFields as r, type HistoricalIndexData as s, type FeeStructureJSON as t, type OracleGuardRailsJSON as u, type FeeStructure as v, type OracleGuardRails as w, DriftSpotBalanceType as x, type ReserveLiquidityFields as y, type ReserveCollateralFields as z };
+export { type ScopeConfigurationJSON as $, type ReserveConfigFields as A, type ReserveFeesFields as B, type CurvePointFields as C, type DriftSpotMarket as D, type BorrowRateCurveFields as E, type FarmStateRaw as F, type PriceHeuristicFields as G, type HistoricalOracleData as H, type InsuranceFund as I, type JupLendingState as J, type ScopeConfigurationFields as K, type SwitchboardConfigurationFields as L, type PythConfigurationFields as M, type ReserveLiquidityJSON as N, type ObligationRaw as O, type PoolBalance as P, type ReserveCollateralJSON as Q, type ReserveRaw as R, type SpotPosition as S, type TokenInfoFields$1 as T, type ReserveConfigJSON as U, type ReserveFeesJSON as V, type WithdrawalCapsFields as W, type BorrowRateCurveJSON as X, type CurvePointJSON as Y, type TokenInfoJSON$1 as Z, type PriceHeuristicJSON as _, type DriftUser as a, type SwitchboardConfigurationJSON as a0, type PythConfigurationJSON as a1, type WithdrawalCapsJSON as a2, type ObligationLiquidityJSON as a3, type ObligationCollateralJSON as a4, type ObligationOrderJSON as a5, type ObligationCollateralFields as a6, type ObligationLiquidityFields as a7, type ObligationOrderFields as a8, type LastUpdateFields as a9, type BigFractionBytesFields as aa, type LastUpdateJSON as ab, type BigFractionBytesJSON as ac, type RewardPerTimeUnitPointFields as ad, type RewardScheduleCurveFields as ae, type RewardScheduleCurveJSON as af, type RewardPerTimeUnitPointJSON as ag, type UserFeesJSON as ah, type UserFeesFields as ai, isSpotBalanceTypeVariant as aj, type FeeTier as ak, type FeeTierJSON as al, type OrderFillerRewardStructure as am, type OrderFillerRewardStructureJSON as an, type PriceDivergenceGuardRails as ao, type PriceDivergenceGuardRailsJSON as ap, type ValidityGuardRails as aq, type ValidityGuardRailsJSON as ar, type HistoricalOracleDataJSON as as, type HistoricalIndexDataJSON as at, type PoolBalanceJSON as au, type InsuranceFundJSON as av, SpotBalanceType as aw, type SpotPositionJSON as ax, type DriftRewards as b, type DriftUserStats as c, type JupTokenReserve as d, type JupLendingRewardsRateModel as e, type JupRateModel as f, type ReserveJSON as g, type ObligationJSON as h, type FarmStateJSON as i, type DriftSpotMarketJSON as j, type DriftUserJSON as k, type DriftRewardsJSON as l, type DriftUserStatsJSON as m, type JupLendingStateJSON as n, type JupTokenReserveJSON as o, type JupLendingRewardsRateModelJSON as p, type JupRateModelJSON as q, type RewardInfoFields as r, type HistoricalIndexData as s, type FeeStructureJSON as t, type OracleGuardRailsJSON as u, type FeeStructure as v, type OracleGuardRails as w, DriftSpotBalanceType as x, type ReserveLiquidityFields as y, type ReserveCollateralFields as z };

package/dist/index.cjs

@@ -13,7 +13,6 @@ var borsh$1 = require('borsh');
 var borsh = require('@coral-xyz/borsh');
 var WebSocket = require('ws');
 var msgpack = require('@msgpack/msgpack');
-var api = require('@jup-ag/api');
 var onDemand = require('@switchboard-xyz/on-demand');
 var common = require('@switchboard-xyz/common');
 
@@ -36125,9 +36124,9 @@ async function makeAccountTransferToNewAccountTx({
   marginfiAccount,
   newMarginfiAccount,
   newAuthority,
-  feePayer,
-  feePayerKeypair
+  feePayer
 }) {
+  const feePayerKey = feePayer instanceof web3_js.Keypair ? feePayer.publicKey : feePayer ?? marginfiAccount.authority;
   const [feeStateKey] = web3_js.PublicKey.findProgramAddressSync(
     [Buffer.from("feestate", "utf-8")],
     program.programId
@@ -36138,18 +36137,18 @@ async function makeAccountTransferToNewAccountTx({
     newMarginfiAccount: newMarginfiAccount.publicKey,
     newAuthority,
     globalFeeWallet: feeState.globalFeeWallet,
-    feePayer
+    feePayer: feePayerKey
   });
   const {
     value: { blockhash }
   } = await connection.getLatestBlockhashAndContext("confirmed");
   const signers = [newMarginfiAccount];
-  if (feePayerKeypair) signers.push(feePayerKeypair);
+  if (feePayer instanceof web3_js.Keypair) signers.push(feePayer);
   const transferTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
         instructions: [transferIx],
-        payerKey: feePayer,
+        payerKey: feePayerKey,
         recentBlockhash: blockhash
       }).compileToV0Message([])
     ),
@@ -49231,6 +49230,61 @@ function computeMaxWithdrawForBank(params) {
   const maxWithdraw = initUntiedCollateralForBank.div(initWeightedPrice);
   return maxWithdraw;
 }
+
+// src/vendor/jupiter/client.ts
+var DEFAULT_BASE_PATH = "https://lite-api.jup.ag/swap/v1";
+var JupiterApiError = class _JupiterApiError extends Error {
+  status;
+  body;
+  constructor(status, body) {
+    super(`Jupiter API request failed with status ${status}: ${body}`);
+    this.name = "JupiterApiError";
+    Object.setPrototypeOf(this, _JupiterApiError.prototype);
+    this.status = status;
+    this.body = body;
+  }
+};
+function buildQuoteSearchParams(request) {
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(request)) {
+    if (value === void 0 || value === null) continue;
+    if (Array.isArray(value)) {
+      if (value.length > 0) params.append(key, value.join(","));
+      continue;
+    }
+    params.append(key, String(value));
+  }
+  return params;
+}
+function createJupiterClient(config = {}) {
+  const basePath = (config.basePath ?? DEFAULT_BASE_PATH).replace(/\/+$/, "");
+  const baseHeaders = { ...config.headers };
+  if (config.apiKey) baseHeaders["x-api-key"] = config.apiKey;
+  const request = async (path, init) => {
+    const response = await fetch(`${basePath}${path}`, init);
+    if (!response.ok) {
+      const body = await response.text().catch(() => "");
+      throw new JupiterApiError(response.status, body);
+    }
+    return await response.json();
+  };
+  return {
+    quoteGet(quoteRequest) {
+      const search = buildQuoteSearchParams(quoteRequest);
+      return request(`/quote?${search.toString()}`, {
+        method: "GET",
+        headers: baseHeaders
+      });
+    },
+    swapInstructionsPost({ swapRequest }) {
+      return request(`/swap-instructions`, {
+        method: "POST",
+        headers: { ...baseHeaders, "content-type": "application/json" },
+        body: JSON.stringify(swapRequest)
+      });
+    }
+  };
+}
 var TITAN_FEE_WALLET = new web3_js.PublicKey("FEES6XLN7dMz2iBwKab9Hri9Kwc4WJ6TmDAiT4BNhyej");
 var getTitanFeeAccount = (mint) => {
   return getAssociatedTokenAddressSync(mint, TITAN_FEE_WALLET, true);
@@ -49608,15 +49662,17 @@ function getExactOutProviderFn({
       });
     case "JUPITER" /* JUPITER */:
       return async () => {
-        const configParams = toJupiterConfig(apiConfig);
-        const jupiterApiClient = configParams?.basePath ? new api.SwapApi(new api.Configuration(configParams)) : api.createJupiterApiClient(configParams);
+        const jupiterApiClient = createJupiterClient(toJupiterConfig(apiConfig));
         const estimateQuote = await jupiterApiClient.quoteGet({
           inputMint,
           outputMint,
           amount,
           swapMode: "ExactOut",
           dynamicSlippage: swapOpts.swapConfig ? swapOpts.swapConfig.slippageMode === "DYNAMIC" : true,
-          slippageBps: swapOpts.swapConfig?.slippageBps
+          slippageBps: swapOpts.swapConfig?.slippageBps,
+          // Match the bundle-compatible routing used by the executed flashloan
+          // swap so the ExactOut estimate reflects an achievable route.
+          forJitoBundle: true
         });
         const quoteResult = mapJupiterQuoteToSwapQuoteResult(estimateQuote);
         return { otherAmountThreshold: quoteResult.otherAmountThreshold, quoteResult };
@@ -49772,7 +49828,7 @@ function toJupiterConfig(apiConfig) {
   if (!apiConfig) return void 0;
   return {
     basePath: apiConfig.basePath,
-    apiKey: apiConfig.apiKey ? () => apiConfig.apiKey : void 0,
+    apiKey: apiConfig.apiKey,
     headers: apiConfig.headers
   };
 }
@@ -49784,8 +49840,7 @@ var getJupiterSwapIxsForFlashloan = async ({
   apiConfig,
   maxSwapAccounts
 }) => {
-  const configParams = toJupiterConfig(apiConfig);
-  const jupiterApiClient = configParams?.basePath ? new api.SwapApi(new api.Configuration(configParams)) : api.createJupiterApiClient(configParams);
+  const jupiterApiClient = createJupiterClient(toJupiterConfig(apiConfig));
   const feeMint = quoteParams.swapMode === "ExactIn" ? quoteParams.outputMint : quoteParams.inputMint;
   const { feeAccount, hasFeeAccount } = await checkFeeAccount(connection, new web3_js.PublicKey(feeMint));
   const project0JupiterLut = (await connection.getAddressLookupTable(ADDRESS_LOOKUP_TABLE_FOR_SWAP))?.value;
@@ -49804,7 +49859,10 @@ var getJupiterSwapIxsForFlashloan = async ({
   const maxAccounts = maxSwapAccounts !== void 0 ? maxSwapAccounts - JUPITER_MAX_ACCOUNTS_MARGIN : 40;
   const swapQuote = await jupiterApiClient.quoteGet({
     ...finalQuoteParams,
-    maxAccounts
+    maxAccounts,
+    // Flashloan swaps are landed via a Jito bundle, so restrict routing to
+    // bundle-compatible DEXes (excludes e.g. HumidiFi).
+    forJitoBundle: true
   });
   const swapInstructionResponse = await jupiterApiClient.swapInstructionsPost({
     swapRequest: {
@@ -54139,30 +54197,29 @@ var MarginfiAccount = class _MarginfiAccount {
     return makeEndFlashLoanIx3(program, this.address, banks, authority);
   }
   /**
-   * Creates an instruction to transfer this account to a new authority.
+   * Builds a transaction to transfer this account to a new authority.
    *
-   * Transfers ownership of the marginfi account to a new authority and account address.
+   * Thin wrapper over the {@link makeAccountTransferToNewAccountTx} action,
+   * injecting the connection and this account from context. The global fee
+   * wallet is derived inside the action from the program's fee state.
    *
    * @param program - The Marginfi program instance
-   * @param newMarginfiAccount - The new marginfi account public key
+   * @param newMarginfiAccount - Freshly generated keypair for the destination account
    * @param newAuthority - The new authority public key
+   * @param feePayer - Optional `PublicKey` (adapter-signed) or `Keypair` (separate
+   *   payer); defaults to this account's authority
    *
-   * @returns Promise resolving to InstructionsWrapper containing the transfer instruction
-   *
-   * @see {@link makeAccountTransferToNewAccountIx} for implementation
+   * @returns Promise resolving to the transfer transaction
    */
-  async makeAccountTransferToNewAccountIx(program, newMarginfiAccount, newAuthority, globalFeeWallet, feePayer) {
-    const accountTransferToNewAccountIx = await instructions_default.makeAccountTransferToNewAccountIx(
+  async makeAccountTransferToNewAccountTx(program, newMarginfiAccount, newAuthority, feePayer) {
+    return makeAccountTransferToNewAccountTx({
+      connection: program.provider.connection,
       program,
-      {
-        oldMarginfiAccount: this.address,
-        newMarginfiAccount,
-        newAuthority,
-        globalFeeWallet,
-        feePayer
-      }
-    );
-    return { instructions: [accountTransferToNewAccountIx], keys: [] };
+      marginfiAccount: this,
+      newMarginfiAccount,
+      newAuthority,
+      feePayer
+    });
   }
   /**
    * Creates an instruction to close this marginfi account.
@@ -54810,17 +54867,18 @@ var MarginfiAccountWrapper = class {
     );
   }
   /**
-   * Creates an account transfer instruction.
+   * Builds a transaction to transfer this account to a new authority.
    *
-   * @param newMarginfiAccount - New account public key
+   * @param newMarginfiAccount - Freshly generated keypair for the destination account
    * @param newAuthority - New authority public key
+   * @param feePayer - Optional `PublicKey` (adapter-signed) or `Keypair` (separate
+   *   payer); defaults to this account's authority
    */
-  async makeAccountTransferToNewAccountIx(newMarginfiAccount, newAuthority, globalFeeWallet, feePayer) {
-    return this.account.makeAccountTransferToNewAccountIx(
+  async makeAccountTransferToNewAccountTx(newMarginfiAccount, newAuthority, feePayer) {
+    return this.account.makeAccountTransferToNewAccountTx(
       this.client.program,
       newMarginfiAccount,
       newAuthority,
-      globalFeeWallet,
       feePayer
     );
   }