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

package/dist/index.d.cts

@@ -1,14 +1,14 @@
 import * as superstruct from 'superstruct';
 import { Infer } from 'superstruct';
-import { R as RiskTier, A as AssetTag, B as BankConfigFlag, O as OperationalState, a as OracleSetup, E as EmodeTag, b as EmodeEntryFlags, c as EmodeFlags, W as WrappedI80F48, I as InterestRateConfigRaw, d as OperationalStateRaw, e as OracleSetupRaw, f as RiskTierRaw, M as MarginfiProgram, g as BankConfigOpt, h as InterestRateConfig, i as BankConfigType, j as BankConfigRaw, k as BankConfigOptRaw, l as BankType, m as EmodeSettingsType, n as BankRaw, o as EmodeSettingsRaw, p as MarginfiIdlType, q as OraclePrice, P as PriceWithConfidence, r as PriceBias, s as OraclePriceDto, H as HealthCacheFlags, t as HealthCacheStatus, u as AccountFlags, v as MarginfiAccountType, w as Amount, x as BankIntegrationMetadataMap, T as TypedAmount, y as BalanceType, z as HealthCacheType, C as EmodePair, D as ActiveEmodePair, F as ActionEmodeImpact, G as MarginRequirementType, J as EmodeImpactStatus, K as BankVaultType, L as BankIntegrationMetadataMapDto, N as BankIntegrationMetadataDto, Q as BankIntegrationMetadata, S as Bank, U as Environment, V as Project0Config, X as MintData } from './types-ZvnTjjh4.cjs';
-export { at as AccountType, ay as AmountType, as as BankAddress, Y as BankConfig, _ as BankConfigCompactRaw, av as BankMap, ar as BankMetadata, $ as BankMetadataRaw, ak as ComputeAssetUsdValueParams, ai as ComputeLiabilityUsdValueParams, ag as ComputeUsdValueParams, a4 as EmodeConfigRaw, a7 as EmodeEntry, a9 as EmodeImpact, Z as EmodeSettings, ab as GetAssetWeightParams, a1 as InterestRateConfigCompactRaw, a6 as InterestRateConfigOpt, a2 as InterestRateConfigOptRaw, au as KaminoStates, ao as MARGINFI_IDL, ax as MintDataMap, a8 as OracleConfigOpt, a3 as OracleConfigOptRaw, aw as OraclePriceMap, an as PriceWithConfidenceDto, ap as Program, a5 as RatePoint, a0 as RatePointRaw, aq as Wallet, al as computeAssetUsdValue, aj as computeLiabilityUsdValue, af as computeLoopingParams, ae as computeMaxLeverage, am as computeTvl, ah as computeUsdValue, ac as getAssetWeight, ad as getLiabilityWeight, aa as isWeightedPrice, az as resolveAmount } from './types-ZvnTjjh4.cjs';
+import { R as RiskTier, A as AssetTag, b as BankConfigFlag, O as OperationalState, c as OracleSetup, E as EmodeTag, d as EmodeEntryFlags, e as EmodeFlags, W as WrappedI80F48, I as InterestRateConfigRaw, f as OperationalStateRaw, g as OracleSetupRaw, h as RiskTierRaw, M as MarginfiProgram, i as BankConfigOpt, j as InterestRateConfig, k as BankConfigType, l as BankConfigRaw, a as BankConfigOptRaw, m as BankType, n as EmodeSettingsType, o as BankRaw, p as EmodeSettingsRaw, q as MarginfiIdlType, r as OraclePrice, P as PriceWithConfidence, s as PriceBias, t as OraclePriceDto, H as HealthCacheFlags, u as HealthCacheStatus, v as AccountFlags, w as MarginfiAccountType, x as Amount, y as BankIntegrationMetadataMap, T as TypedAmount, z as BalanceType, C as HealthCacheType, D as EmodePair, F as ActiveEmodePair, G as ActionEmodeImpact, J as MarginRequirementType, K as EmodeImpactStatus, L as BankVaultType, N as BankIntegrationMetadataMapDto, Q as BankIntegrationMetadataDto, S as BankIntegrationMetadata, U as Bank, V as Environment, X as Project0Config, Y as MintData } from './types-CsLjciLo.cjs';
+export { at as AccountType, ay as AmountType, as as BankAddress, Z as BankConfig, B as BankConfigCompactRaw, av as BankMap, ar as BankMetadata, $ as BankMetadataRaw, ak as ComputeAssetUsdValueParams, ai as ComputeLiabilityUsdValueParams, ag as ComputeUsdValueParams, a4 as EmodeConfigRaw, a7 as EmodeEntry, a9 as EmodeImpact, _ as EmodeSettings, ab as GetAssetWeightParams, a1 as InterestRateConfigCompactRaw, a6 as InterestRateConfigOpt, a2 as InterestRateConfigOptRaw, au as KaminoStates, ao as MARGINFI_IDL, ax as MintDataMap, a8 as OracleConfigOpt, a3 as OracleConfigOptRaw, aw as OraclePriceMap, an as PriceWithConfidenceDto, ap as Program, a5 as RatePoint, a0 as RatePointRaw, aq as Wallet, al as computeAssetUsdValue, aj as computeLiabilityUsdValue, af as computeLoopingParams, ae as computeMaxLeverage, am as computeTvl, ah as computeUsdValue, ac as getAssetWeight, ad as getLiabilityWeight, aa as isWeightedPrice, az as resolveAmount } from './types-CsLjciLo.cjs';
 import * as _solana_web3_js from '@solana/web3.js';
 import { VersionedTransaction, Transaction, PublicKey, TransactionError, TransactionInstruction, Keypair, Signer, AddressLookupTableAccount, Blockhash, TransactionMessage, Connection, AccountInfo } from '@solana/web3.js';
 import { Idl, Instruction, AnchorProvider, Address } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import BigNumber$1 from 'bignumber.js';
-import { R as ReserveRaw, D as DriftSpotMarket, a as DriftRewards, J as JupLendingState, b as ReserveJSON, O as ObligationJSON, F as FarmStateJSON, c as ObligationRaw, d as FarmStateRaw, e as DriftSpotMarketJSON, f as DriftUserJSON, g as DriftRewardsJSON, h as DriftUserStatsJSON, i as DriftUser, j as DriftUserStats, k as JupLendingStateJSON, l as JupTokenReserveJSON, m as JupLendingRewardsRateModelJSON, n as JupRateModelJSON, o as JupTokenReserve, p as JupLendingRewardsRateModel, q as JupRateModel } from './dto-rate-model.types-AQ40wS-P.cjs';
-import { ConfigurationParameters, QuoteGetRequest, QuoteResponse } from '@jup-ag/api';
+import { R as ReserveRaw, D as DriftSpotMarket, b as DriftRewards, J as JupLendingState, g as ReserveJSON, h as ObligationJSON, i as FarmStateJSON, O as ObligationRaw, F as FarmStateRaw, j as DriftSpotMarketJSON, k as DriftUserJSON, l as DriftRewardsJSON, m as DriftUserStatsJSON, a as DriftUser, c as DriftUserStats, n as JupLendingStateJSON, o as JupTokenReserveJSON, p as JupLendingRewardsRateModelJSON, q as JupRateModelJSON, d as JupTokenReserve, e as JupLendingRewardsRateModel, f as JupRateModel } from './dto-rate-model.types-DveIB9Ll.cjs';
+import { JupiterClientConfig, QuoteGetRequest, QuoteResponse } from './jupiter.cjs';
 import { F as FeedResponse } from './index-BDDVBMdM.cjs';
 
 interface RpcSimulateBundleTransactionResult {
@@ -1014,10 +1014,10 @@ interface MakeAccountTransferToNewAccountTxParams {
     newMarginfiAccount: Signer;
     /** The wallet that will own the new account. */
     newAuthority: PublicKey;
-    /** Pays rent/fees — the connected wallet, or a separate fee payer. */
-    feePayer: PublicKey;
-    /** Required only when `feePayer` is a separate keypair (not the connected wallet). */
-    feePayerKeypair?: Signer;
+    /** Optional. Pays rent/fees. A `PublicKey` signs via the wallet adapter; a
+     *  `Keypair` is a separate fee payer that signs directly. Defaults to the
+     *  account's current authority. */
+    feePayer?: PublicKey | Keypair;
 }
 interface TransactionBuilderResult {
     transactions: SolanaTransaction[];
@@ -2383,7 +2383,7 @@ interface ComputeMaxWithdrawForBankParams {
  */
 declare function computeMaxWithdrawForBank(params: ComputeMaxWithdrawForBankParams): BigNumber$1;
 
-declare function toJupiterConfig(apiConfig?: SwapApiConfig): ConfigurationParameters | undefined;
+declare function toJupiterConfig(apiConfig?: SwapApiConfig): JupiterClientConfig | undefined;
 type GetJupiterSwapIxsForFlashloanParams = {
     quoteParams: QuoteGetRequest;
     authority: PublicKey;
@@ -2613,11 +2613,12 @@ declare function makeCloseMarginfiAccountTx({ connection, program, marginfiAccou
  * @param params.marginfiAccount - The account being transferred
  * @param params.newMarginfiAccount - Freshly generated keypair for the destination account
  * @param params.newAuthority - The wallet that will own the new account
- * @param params.feePayer - Pays rent/fees (the connected wallet, or a separate fee payer)
- * @param params.feePayerKeypair - Required only when `feePayer` is a separate keypair
+ * @param params.feePayer - Optional. Pays rent/fees. A `PublicKey` signs via the
+ *   wallet adapter; a `Keypair` is a separate fee payer that signs directly.
+ *   Defaults to the account's current authority.
  * @returns Versioned transaction to transfer the account
  */
-declare function makeAccountTransferToNewAccountTx({ connection, program, marginfiAccount, newMarginfiAccount, newAuthority, feePayer, feePayerKeypair, }: MakeAccountTransferToNewAccountTxParams): Promise<SolanaTransaction>;
+declare function makeAccountTransferToNewAccountTx({ connection, program, marginfiAccount, newMarginfiAccount, newAuthority, feePayer, }: MakeAccountTransferToNewAccountTxParams): Promise<ExtendedV0Transaction>;
 /**
  * Creates a new Marginfi account transaction with a projected account instance.
  *
@@ -4681,19 +4682,21 @@ declare class MarginfiAccount implements MarginfiAccountType {
      */
     makeEndFlashLoanIx(program: MarginfiProgram, bankMap: Map<string, Bank>, projectedActiveBanks: PublicKey[], authority?: PublicKey): Promise<InstructionsWrapper>;
     /**
-     * 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
      */
-    makeAccountTransferToNewAccountIx(program: MarginfiProgram, newMarginfiAccount: PublicKey, newAuthority: PublicKey, globalFeeWallet: PublicKey, feePayer: PublicKey): Promise<InstructionsWrapper>;
+    makeAccountTransferToNewAccountTx(program: MarginfiProgram, newMarginfiAccount: Keypair, newAuthority: PublicKey, feePayer?: PublicKey | Keypair): Promise<ExtendedV0Transaction>;
     /**
      * Creates an instruction to close this marginfi account.
      *
@@ -5172,12 +5175,14 @@ declare class MarginfiAccountWrapper {
      */
     makeEndFlashLoanIx(projectedActiveBanks: PublicKey[], authority?: PublicKey): Promise<InstructionsWrapper>;
     /**
-     * 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
      */
-    makeAccountTransferToNewAccountIx(newMarginfiAccount: PublicKey, newAuthority: PublicKey, globalFeeWallet: PublicKey, feePayer: PublicKey): Promise<InstructionsWrapper>;
+    makeAccountTransferToNewAccountTx(newMarginfiAccount: Keypair, newAuthority: PublicKey, feePayer?: PublicKey | Keypair): Promise<ExtendedV0Transaction>;
     /**
      * Creates a close account instruction.
      */

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 import * as superstruct from 'superstruct';
 import { Infer } from 'superstruct';
-import { R as RiskTier, A as AssetTag, B as BankConfigFlag, O as OperationalState, a as OracleSetup, E as EmodeTag, b as EmodeEntryFlags, c as EmodeFlags, W as WrappedI80F48, I as InterestRateConfigRaw, d as OperationalStateRaw, e as OracleSetupRaw, f as RiskTierRaw, M as MarginfiProgram, g as BankConfigOpt, h as InterestRateConfig, i as BankConfigType, j as BankConfigRaw, k as BankConfigOptRaw, l as BankType, m as EmodeSettingsType, n as BankRaw, o as EmodeSettingsRaw, p as MarginfiIdlType, q as OraclePrice, P as PriceWithConfidence, r as PriceBias, s as OraclePriceDto, H as HealthCacheFlags, t as HealthCacheStatus, u as AccountFlags, v as MarginfiAccountType, w as Amount, x as BankIntegrationMetadataMap, T as TypedAmount, y as BalanceType, z as HealthCacheType, C as EmodePair, D as ActiveEmodePair, F as ActionEmodeImpact, G as MarginRequirementType, J as EmodeImpactStatus, K as BankVaultType, L as BankIntegrationMetadataMapDto, N as BankIntegrationMetadataDto, Q as BankIntegrationMetadata, S as Bank, U as Environment, V as Project0Config, X as MintData } from './types-DGWxbPM1.js';
-export { at as AccountType, ay as AmountType, as as BankAddress, Y as BankConfig, _ as BankConfigCompactRaw, av as BankMap, ar as BankMetadata, $ as BankMetadataRaw, ak as ComputeAssetUsdValueParams, ai as ComputeLiabilityUsdValueParams, ag as ComputeUsdValueParams, a4 as EmodeConfigRaw, a7 as EmodeEntry, a9 as EmodeImpact, Z as EmodeSettings, ab as GetAssetWeightParams, a1 as InterestRateConfigCompactRaw, a6 as InterestRateConfigOpt, a2 as InterestRateConfigOptRaw, au as KaminoStates, ao as MARGINFI_IDL, ax as MintDataMap, a8 as OracleConfigOpt, a3 as OracleConfigOptRaw, aw as OraclePriceMap, an as PriceWithConfidenceDto, ap as Program, a5 as RatePoint, a0 as RatePointRaw, aq as Wallet, al as computeAssetUsdValue, aj as computeLiabilityUsdValue, af as computeLoopingParams, ae as computeMaxLeverage, am as computeTvl, ah as computeUsdValue, ac as getAssetWeight, ad as getLiabilityWeight, aa as isWeightedPrice, az as resolveAmount } from './types-DGWxbPM1.js';
+import { R as RiskTier, A as AssetTag, b as BankConfigFlag, O as OperationalState, c as OracleSetup, E as EmodeTag, d as EmodeEntryFlags, e as EmodeFlags, W as WrappedI80F48, I as InterestRateConfigRaw, f as OperationalStateRaw, g as OracleSetupRaw, h as RiskTierRaw, M as MarginfiProgram, i as BankConfigOpt, j as InterestRateConfig, k as BankConfigType, l as BankConfigRaw, a as BankConfigOptRaw, m as BankType, n as EmodeSettingsType, o as BankRaw, p as EmodeSettingsRaw, q as MarginfiIdlType, r as OraclePrice, P as PriceWithConfidence, s as PriceBias, t as OraclePriceDto, H as HealthCacheFlags, u as HealthCacheStatus, v as AccountFlags, w as MarginfiAccountType, x as Amount, y as BankIntegrationMetadataMap, T as TypedAmount, z as BalanceType, C as HealthCacheType, D as EmodePair, F as ActiveEmodePair, G as ActionEmodeImpact, J as MarginRequirementType, K as EmodeImpactStatus, L as BankVaultType, N as BankIntegrationMetadataMapDto, Q as BankIntegrationMetadataDto, S as BankIntegrationMetadata, U as Bank, V as Environment, X as Project0Config, Y as MintData } from './types-DuCxJVOn.js';
+export { at as AccountType, ay as AmountType, as as BankAddress, Z as BankConfig, B as BankConfigCompactRaw, av as BankMap, ar as BankMetadata, $ as BankMetadataRaw, ak as ComputeAssetUsdValueParams, ai as ComputeLiabilityUsdValueParams, ag as ComputeUsdValueParams, a4 as EmodeConfigRaw, a7 as EmodeEntry, a9 as EmodeImpact, _ as EmodeSettings, ab as GetAssetWeightParams, a1 as InterestRateConfigCompactRaw, a6 as InterestRateConfigOpt, a2 as InterestRateConfigOptRaw, au as KaminoStates, ao as MARGINFI_IDL, ax as MintDataMap, a8 as OracleConfigOpt, a3 as OracleConfigOptRaw, aw as OraclePriceMap, an as PriceWithConfidenceDto, ap as Program, a5 as RatePoint, a0 as RatePointRaw, aq as Wallet, al as computeAssetUsdValue, aj as computeLiabilityUsdValue, af as computeLoopingParams, ae as computeMaxLeverage, am as computeTvl, ah as computeUsdValue, ac as getAssetWeight, ad as getLiabilityWeight, aa as isWeightedPrice, az as resolveAmount } from './types-DuCxJVOn.js';
 import * as _solana_web3_js from '@solana/web3.js';
 import { VersionedTransaction, Transaction, PublicKey, TransactionError, TransactionInstruction, Keypair, Signer, AddressLookupTableAccount, Blockhash, TransactionMessage, Connection, AccountInfo } from '@solana/web3.js';
 import { Idl, Instruction, AnchorProvider, Address } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import BigNumber$1 from 'bignumber.js';
-import { R as ReserveRaw, D as DriftSpotMarket, a as DriftRewards, J as JupLendingState, b as ReserveJSON, O as ObligationJSON, F as FarmStateJSON, c as ObligationRaw, d as FarmStateRaw, e as DriftSpotMarketJSON, f as DriftUserJSON, g as DriftRewardsJSON, h as DriftUserStatsJSON, i as DriftUser, j as DriftUserStats, k as JupLendingStateJSON, l as JupTokenReserveJSON, m as JupLendingRewardsRateModelJSON, n as JupRateModelJSON, o as JupTokenReserve, p as JupLendingRewardsRateModel, q as JupRateModel } from './dto-rate-model.types-AQ40wS-P.js';
-import { ConfigurationParameters, QuoteGetRequest, QuoteResponse } from '@jup-ag/api';
+import { R as ReserveRaw, D as DriftSpotMarket, b as DriftRewards, J as JupLendingState, g as ReserveJSON, h as ObligationJSON, i as FarmStateJSON, O as ObligationRaw, F as FarmStateRaw, j as DriftSpotMarketJSON, k as DriftUserJSON, l as DriftRewardsJSON, m as DriftUserStatsJSON, a as DriftUser, c as DriftUserStats, n as JupLendingStateJSON, o as JupTokenReserveJSON, p as JupLendingRewardsRateModelJSON, q as JupRateModelJSON, d as JupTokenReserve, e as JupLendingRewardsRateModel, f as JupRateModel } from './dto-rate-model.types-DveIB9Ll.js';
+import { JupiterClientConfig, QuoteGetRequest, QuoteResponse } from './jupiter.js';
 import { F as FeedResponse } from './index-BDDVBMdM.js';
 
 interface RpcSimulateBundleTransactionResult {
@@ -1014,10 +1014,10 @@ interface MakeAccountTransferToNewAccountTxParams {
     newMarginfiAccount: Signer;
     /** The wallet that will own the new account. */
     newAuthority: PublicKey;
-    /** Pays rent/fees — the connected wallet, or a separate fee payer. */
-    feePayer: PublicKey;
-    /** Required only when `feePayer` is a separate keypair (not the connected wallet). */
-    feePayerKeypair?: Signer;
+    /** Optional. Pays rent/fees. A `PublicKey` signs via the wallet adapter; a
+     *  `Keypair` is a separate fee payer that signs directly. Defaults to the
+     *  account's current authority. */
+    feePayer?: PublicKey | Keypair;
 }
 interface TransactionBuilderResult {
     transactions: SolanaTransaction[];
@@ -2383,7 +2383,7 @@ interface ComputeMaxWithdrawForBankParams {
  */
 declare function computeMaxWithdrawForBank(params: ComputeMaxWithdrawForBankParams): BigNumber$1;
 
-declare function toJupiterConfig(apiConfig?: SwapApiConfig): ConfigurationParameters | undefined;
+declare function toJupiterConfig(apiConfig?: SwapApiConfig): JupiterClientConfig | undefined;
 type GetJupiterSwapIxsForFlashloanParams = {
     quoteParams: QuoteGetRequest;
     authority: PublicKey;
@@ -2613,11 +2613,12 @@ declare function makeCloseMarginfiAccountTx({ connection, program, marginfiAccou
  * @param params.marginfiAccount - The account being transferred
  * @param params.newMarginfiAccount - Freshly generated keypair for the destination account
  * @param params.newAuthority - The wallet that will own the new account
- * @param params.feePayer - Pays rent/fees (the connected wallet, or a separate fee payer)
- * @param params.feePayerKeypair - Required only when `feePayer` is a separate keypair
+ * @param params.feePayer - Optional. Pays rent/fees. A `PublicKey` signs via the
+ *   wallet adapter; a `Keypair` is a separate fee payer that signs directly.
+ *   Defaults to the account's current authority.
  * @returns Versioned transaction to transfer the account
  */
-declare function makeAccountTransferToNewAccountTx({ connection, program, marginfiAccount, newMarginfiAccount, newAuthority, feePayer, feePayerKeypair, }: MakeAccountTransferToNewAccountTxParams): Promise<SolanaTransaction>;
+declare function makeAccountTransferToNewAccountTx({ connection, program, marginfiAccount, newMarginfiAccount, newAuthority, feePayer, }: MakeAccountTransferToNewAccountTxParams): Promise<ExtendedV0Transaction>;
 /**
  * Creates a new Marginfi account transaction with a projected account instance.
  *
@@ -4681,19 +4682,21 @@ declare class MarginfiAccount implements MarginfiAccountType {
      */
     makeEndFlashLoanIx(program: MarginfiProgram, bankMap: Map<string, Bank>, projectedActiveBanks: PublicKey[], authority?: PublicKey): Promise<InstructionsWrapper>;
     /**
-     * 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
      */
-    makeAccountTransferToNewAccountIx(program: MarginfiProgram, newMarginfiAccount: PublicKey, newAuthority: PublicKey, globalFeeWallet: PublicKey, feePayer: PublicKey): Promise<InstructionsWrapper>;
+    makeAccountTransferToNewAccountTx(program: MarginfiProgram, newMarginfiAccount: Keypair, newAuthority: PublicKey, feePayer?: PublicKey | Keypair): Promise<ExtendedV0Transaction>;
     /**
      * Creates an instruction to close this marginfi account.
      *
@@ -5172,12 +5175,14 @@ declare class MarginfiAccountWrapper {
      */
     makeEndFlashLoanIx(projectedActiveBanks: PublicKey[], authority?: PublicKey): Promise<InstructionsWrapper>;
     /**
-     * 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
      */
-    makeAccountTransferToNewAccountIx(newMarginfiAccount: PublicKey, newAuthority: PublicKey, globalFeeWallet: PublicKey, feePayer: PublicKey): Promise<InstructionsWrapper>;
+    makeAccountTransferToNewAccountTx(newMarginfiAccount: Keypair, newAuthority: PublicKey, feePayer?: PublicKey | Keypair): Promise<ExtendedV0Transaction>;
     /**
      * Creates a close account instruction.
      */

package/dist/index.js

@@ -1,4 +1,4 @@
-import { PublicKey, SolanaJSONRPCError, ComputeBudgetProgram, SystemProgram, TransactionMessage, VersionedTransaction, Transaction, AddressLookupTableAccount, SYSVAR_RENT_PUBKEY, StakeProgram, TransactionInstruction, LAMPORTS_PER_SOL, Keypair, StakeAuthorizationLayout, SYSVAR_INSTRUCTIONS_PUBKEY, STAKE_CONFIG_ID as STAKE_CONFIG_ID$1 } from '@solana/web3.js';
+import { PublicKey, SolanaJSONRPCError, ComputeBudgetProgram, SystemProgram, TransactionMessage, VersionedTransaction, Keypair, Transaction, AddressLookupTableAccount, SYSVAR_RENT_PUBKEY, StakeProgram, TransactionInstruction, LAMPORTS_PER_SOL, StakeAuthorizationLayout, SYSVAR_INSTRUCTIONS_PUBKEY, STAKE_CONFIG_ID as STAKE_CONFIG_ID$1 } from '@solana/web3.js';
 import { object, string, enums, array, assert } from 'superstruct';
 import BigNumber3, { BigNumber } from 'bignumber.js';
 import BN11, { BN } from 'bn.js';
@@ -12,7 +12,6 @@ import * as borsh from '@coral-xyz/borsh';
 import { struct as struct$1, bool as bool$1, publicKey as publicKey$1, array as array$1, u64 as u64$1, u8 as u8$1, u32 as u32$1, u128 } from '@coral-xyz/borsh';
 import WebSocket from 'ws';
 import { Encoder, Decoder } from '@msgpack/msgpack';
-import { SwapApi, Configuration, createJupiterApiClient } from '@jup-ag/api';
 import { AnchorUtils, PullFeed } from '@switchboard-xyz/on-demand';
 import { CrossbarClient } from '@switchboard-xyz/common';
 
@@ -36098,9 +36097,9 @@ async function makeAccountTransferToNewAccountTx({
   marginfiAccount,
   newMarginfiAccount,
   newAuthority,
-  feePayer,
-  feePayerKeypair
+  feePayer
 }) {
+  const feePayerKey = feePayer instanceof Keypair ? feePayer.publicKey : feePayer ?? marginfiAccount.authority;
   const [feeStateKey] = PublicKey.findProgramAddressSync(
     [Buffer.from("feestate", "utf-8")],
     program.programId
@@ -36111,18 +36110,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 Keypair) signers.push(feePayer);
   const transferTx = addTransactionMetadata(
     new VersionedTransaction(
       new TransactionMessage({
         instructions: [transferIx],
-        payerKey: feePayer,
+        payerKey: feePayerKey,
         recentBlockhash: blockhash
       }).compileToV0Message([])
     ),
@@ -49204,6 +49203,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 PublicKey("FEES6XLN7dMz2iBwKab9Hri9Kwc4WJ6TmDAiT4BNhyej");
 var getTitanFeeAccount = (mint) => {
   return getAssociatedTokenAddressSync(mint, TITAN_FEE_WALLET, true);
@@ -49581,15 +49635,17 @@ function getExactOutProviderFn({
       });
     case "JUPITER" /* JUPITER */:
       return async () => {
-        const configParams = toJupiterConfig(apiConfig);
-        const jupiterApiClient = configParams?.basePath ? new SwapApi(new Configuration(configParams)) : 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 };
@@ -49745,7 +49801,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
   };
 }
@@ -49757,8 +49813,7 @@ var getJupiterSwapIxsForFlashloan = async ({
   apiConfig,
   maxSwapAccounts
 }) => {
-  const configParams = toJupiterConfig(apiConfig);
-  const jupiterApiClient = configParams?.basePath ? new SwapApi(new Configuration(configParams)) : createJupiterApiClient(configParams);
+  const jupiterApiClient = createJupiterClient(toJupiterConfig(apiConfig));
   const feeMint = quoteParams.swapMode === "ExactIn" ? quoteParams.outputMint : quoteParams.inputMint;
   const { feeAccount, hasFeeAccount } = await checkFeeAccount(connection, new PublicKey(feeMint));
   const project0JupiterLut = (await connection.getAddressLookupTable(ADDRESS_LOOKUP_TABLE_FOR_SWAP))?.value;
@@ -49777,7 +49832,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: {
@@ -54112,30 +54170,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.
@@ -54783,17 +54840,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
     );
   }