@0dotxyz/p0-ts-sdk 2.3.0-alpha.3 → 2.3.0-alpha.4

package/dist/index.d.cts

@@ -1251,23 +1251,19 @@ interface MakeSwapCollateralTxParams {
     swapEngineRunner?: SwapEngineRunner;
 }
 /**
- * Params for {@link makeRollPtTx} — rolling a matured Exponent PT collateral position
- * into its next-maturity PT, entirely within Exponent (no unwrap, no external aggregator).
- *
- * SY is Exponent's internal unit of account and is maturity-independent (the same SY mint
- * backs every maturity of an underlying), so the roll stays in SY end-to-end:
- *   1. withdraw the old PT, then `merge` it into SY (Exponent, 1:1, no slippage)
- *   2. buy the new PT with that SY on the successor maturity's venue
+ * Params for {@link makeRollPtTx} — rolling a matured Exponent PT collateral position into
+ * its next-maturity PT, so the **full deposit ends up as new PT** (no leftover), in one
+ * flash-loan-wrapped bundle:
+ *   1. withdraw the old PT, then Exponent `wrapper_merge` (redeem PT → underlying **base**
+ *      token, e.g. bulkSOL — in one ix, post-maturity, no slippage)
+ *   2. swap base → new PT via the multi-provider swap engine (the same one the loop/collateral
+ *      swaps use — a normal token is swappable, the un-swappable SY is never exposed)
  *   3. deposit the new PT.
  *
- * The buy leg (step 2) is **venue-agnostic**: the caller supplies the SY→PT_new
- * instructions via `rollOpts.buyInstructions` (+ any `buyLookupTables`). They may come from
- * `strip` ({@link makeExponentStripIx}, *mints* PT — unbounded), the legacy `MarketTwo`
- * ({@link makeExponentTradePtIx}), the CLMM/orderbook, etc. The only requirements: the buy
- * spends from the SY account the `merge` writes to (`mergeAccounts.sySrcDstAta`) and
- * delivers ≥ `ptOutNative` of the deposit bank's PT mint to the owner's PT ATA.
- *
- * Mirrors {@link MakeSwapCollateralTxParams} (`rollOpts` is the roll's analog of `swapOpts`).
+ * Structurally identical to {@link MakeSwapCollateralTxParams} with a `wrapper_merge` leg in
+ * front: it takes the same `swapOpts` (base → new PT) plus a thin `rollOpts` (the matured
+ * Exponent market/vault + the underlying base token). The swap is liquidity-bounded by the
+ * new PT's market depth.
  */
 interface MakeRollPtTxParams {
     program: MarginfiProgram;
@@ -1289,7 +1285,9 @@ interface MakeRollPtTxParams {
         depositBank: BankType;
         tokenProgram: PublicKey;
     };
-    /** Exponent merge + buy-leg config (the roll's analog of swap-collateral's `swapOpts`). */
+    /** Swap config for the base → new-PT leg (same as swap-collateral's `swapOpts`). */
+    swapOpts: SwapOpts;
+    /** Exponent `wrapper_merge` (redeem) config for the matured PT. */
     rollOpts: RollPtOpts;
     addressLookupTableAccounts?: AddressLookupTableAccount[];
     overrideInferAccounts?: {
@@ -1297,53 +1295,32 @@ interface MakeRollPtTxParams {
         authority?: PublicKey;
     };
     crossbarUrl?: string;
+    /** See `MakeLoopTxParams.swapEngineRunner`. */
+    swapEngineRunner?: SwapEngineRunner;
 }
 /**
- * High-level Exponent config for {@link makeRollPtTx} — the roll's analog of `swapOpts`.
- *
- * `makeRollPtTx` resolves the matured `merge` and (by default) builds the `strip` buy leg
- * internally from these addresses, so the caller never assembles Exponent accounts/ixs.
- * For a non-strip venue, supply a pre-built buy leg via {@link RollPtOpts.buy} (the analog
- * of `makeLoopTx`'s `swapEngineRunner` override).
+ * Exponent redeem config for {@link makeRollPtTx}. `makeRollPtTx` resolves the matured vault's
+ * `wrapper_merge` accounts internally from these addresses — the caller never assembles
+ * Exponent accounts/ixs. The buy leg is the swap engine (`swapOpts`), not part of this.
  */
 interface RollPtOpts {
-    /** The matured PT's Exponent `MarketTwo` — used to resolve `merge` (one of market/vault required). */
+    /** The matured PT's Exponent `MarketTwo` — its `vault` is read (one of market/vault required). */
     maturedMarket?: PublicKey;
     /** …or the matured vault directly. */
     maturedVault?: PublicKey;
     /**
-     * The successor (active) vault to `strip` PT_new from — one of vault/market required for
-     * the default strip buy leg (ignored when {@link RollPtOpts.buy} is provided).
+     * The vault's underlying **base** token (e.g. bulkSOL) — the token `wrapper_merge` redeems
+     * the SY into and the swap leg consumes. Required: it isn't stored on the vault.
      */
-    successorVault?: PublicKey;
-    /** …or the successor market (its vault is read). */
-    successorMarket?: PublicKey;
+    baseMint: PublicKey;
+    /** Token program for the base mint (defaults to the classic Token program). */
+    baseTokenProgram?: PublicKey;
     /**
      * Optional dedicated PT-roll address lookup table (fetched internally) that compresses the
-     * strip flashloan's two SY-CPI account sets back under the tx size limit
+     * `wrapper_merge` + swap flashloan back under the tx size limit
      * (see `examples/create-pt-roll-lut.ts`).
      */
     lookupTable?: PublicKey;
-    /**
-     * Slippage/rounding buffer in basis points applied to the strip's SY-in and the minted-PT
-     * deposit floor, so on-chain merge rounding / SY-rate lag never short the strip. Default 10.
-     */
-    slippageBps?: number;
-    /**
-     * Escape hatch: a pre-built SY→PT_new buy leg (e.g. legacy `MarketTwo` `trade_pt`, CLMM)
-     * to use instead of the internal `strip`. When set, `successorVault`/`successorMarket` and
-     * the internal strip build are skipped. The buy must spend from the merge's SY account
-     * (`mergeAccounts.sySrcDstAta`) and deliver ≥ `ptOutNative` PT to the owner's PT ATA.
-     */
-    buy?: {
-        instructions: TransactionInstruction[];
-        /** ATA creates etc. — placed in the setup tx, not the flashloan. */
-        setupInstructions?: TransactionInstruction[];
-        /** LUTs the buy instructions reference. */
-        lookupTables?: AddressLookupTableAccount[];
-        /** Native PT the buy guarantees — the deposit amount (byte-patched). */
-        ptOutNative: bigint;
-    };
 }
 interface MakeSwapDebtTxParams {
     program: MarginfiProgram;
@@ -3391,15 +3368,17 @@ declare function makeSwapDebtTx(params: MakeSwapDebtTxParams): Promise<{
 }>;
 
 /**
- * Roll a matured Exponent PT collateral position into its next-maturity PT, in one
- * flash-loan-wrapped bundle — entirely within Exponent, no unwrap, no external swap:
+ * Roll a matured Exponent PT collateral position into its next-maturity PT, so the **full
+ * deposit ends up as new PT** (no leftover), in one flash-loan-wrapped bundle:
  *
- *   withdraw PT_old → Exponent `merge` (PT_old → SY) → SY → PT_new buy → deposit PT_new
+ *   withdraw PT_old → Exponent `wrapper_merge` (PT_old → underlying base, e.g. bulkSOL)
+ *     → swap-engine (base → PT_new, Titan/Jupiter) → deposit PT_new
  *
- * The caller passes high-level config (`rollOpts`: the matured + successor markets); this
- * resolves the `merge` and (by default) builds the `strip` buy leg internally — the same
- * way `makeLoopTx`/`makeSwapCollateralTx` internalize their swap. For a non-strip venue
- * (e.g. legacy `MarketTwo` `trade_pt`), pass a pre-built buy leg via `rollOpts.buy`.
+ * Structurally `makeSwapCollateralTx` with a `wrapper_merge` leg in front: the matured PT is
+ * redeemed to a normal, swappable base token (never the un-swappable SY), then the existing
+ * multi-provider swap engine buys the new PT. The caller passes the matured Exponent
+ * market/vault + base token (`rollOpts`) and the swap config (`swapOpts`); everything Exponent
+ * is resolved internally. The buy is bounded by the new PT's market depth.
  */
 declare function makeRollPtTx(params: MakeRollPtTxParams): Promise<{
     transactions: ExtendedV0Transaction[];
@@ -5223,9 +5202,10 @@ declare class MarginfiAccount implements MarginfiAccountType {
     /**
      * Creates a transaction to roll a matured Exponent PT collateral position into its
      * next-maturity PT, in one flash-loan-wrapped bundle
-     * (withdraw PT_old → merge → buy PT_new → deposit). See {@link makeRollPtTx}.
+     * (withdraw PT_old → `wrapper_merge` to base → swap-engine buy PT_new → deposit).
+     * See {@link makeRollPtTx}.
      *
-     * @param params - Roll-PT parameters (`withdrawOpts`/`depositOpts`/`rollOpts`).
+     * @param params - Roll-PT parameters (`withdrawOpts`/`depositOpts`/`swapOpts`/`rollOpts`).
      */
     makeRollPtTx(params: Omit<MakeRollPtTxParams, "marginfiAccount">): Promise<{
         transactions: ExtendedV0Transaction[];
@@ -5595,12 +5575,12 @@ declare class MarginfiAccountWrapper {
     }>;
     /**
      * Rolls a matured Exponent PT collateral position into its next-maturity PT, with
-     * auto-injected client data (withdraw PT_old → merge → buy PT_new → deposit, flash-loan
-     * wrapped). The buy leg is venue-agnostic — supplied via `rollOpts.buyInstructions`.
+     * auto-injected client data (withdraw PT_old → `wrapper_merge` to base → swap-engine buy
+     * PT_new → deposit, flash-loan wrapped). The full deposit ends up as new PT.
      *
      * Auto-injects: program, marginfiAccount, bankMap, oraclePrices, bankMetadataMap, addressLookupTables
      *
-     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, rollOpts, etc.)
+     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, swapOpts, rollOpts, etc.)
      */
     makeRollPtTx(params: Omit<MakeRollPtTxParams, "program" | "marginfiAccount" | "bankMap" | "oraclePrices" | "bankMetadataMap" | "addressLookupTableAccounts">): Promise<{
         transactions: ExtendedV0Transaction[];

package/dist/index.d.ts

@@ -1251,23 +1251,19 @@ interface MakeSwapCollateralTxParams {
     swapEngineRunner?: SwapEngineRunner;
 }
 /**
- * Params for {@link makeRollPtTx} — rolling a matured Exponent PT collateral position
- * into its next-maturity PT, entirely within Exponent (no unwrap, no external aggregator).
- *
- * SY is Exponent's internal unit of account and is maturity-independent (the same SY mint
- * backs every maturity of an underlying), so the roll stays in SY end-to-end:
- *   1. withdraw the old PT, then `merge` it into SY (Exponent, 1:1, no slippage)
- *   2. buy the new PT with that SY on the successor maturity's venue
+ * Params for {@link makeRollPtTx} — rolling a matured Exponent PT collateral position into
+ * its next-maturity PT, so the **full deposit ends up as new PT** (no leftover), in one
+ * flash-loan-wrapped bundle:
+ *   1. withdraw the old PT, then Exponent `wrapper_merge` (redeem PT → underlying **base**
+ *      token, e.g. bulkSOL — in one ix, post-maturity, no slippage)
+ *   2. swap base → new PT via the multi-provider swap engine (the same one the loop/collateral
+ *      swaps use — a normal token is swappable, the un-swappable SY is never exposed)
  *   3. deposit the new PT.
  *
- * The buy leg (step 2) is **venue-agnostic**: the caller supplies the SY→PT_new
- * instructions via `rollOpts.buyInstructions` (+ any `buyLookupTables`). They may come from
- * `strip` ({@link makeExponentStripIx}, *mints* PT — unbounded), the legacy `MarketTwo`
- * ({@link makeExponentTradePtIx}), the CLMM/orderbook, etc. The only requirements: the buy
- * spends from the SY account the `merge` writes to (`mergeAccounts.sySrcDstAta`) and
- * delivers ≥ `ptOutNative` of the deposit bank's PT mint to the owner's PT ATA.
- *
- * Mirrors {@link MakeSwapCollateralTxParams} (`rollOpts` is the roll's analog of `swapOpts`).
+ * Structurally identical to {@link MakeSwapCollateralTxParams} with a `wrapper_merge` leg in
+ * front: it takes the same `swapOpts` (base → new PT) plus a thin `rollOpts` (the matured
+ * Exponent market/vault + the underlying base token). The swap is liquidity-bounded by the
+ * new PT's market depth.
  */
 interface MakeRollPtTxParams {
     program: MarginfiProgram;
@@ -1289,7 +1285,9 @@ interface MakeRollPtTxParams {
         depositBank: BankType;
         tokenProgram: PublicKey;
     };
-    /** Exponent merge + buy-leg config (the roll's analog of swap-collateral's `swapOpts`). */
+    /** Swap config for the base → new-PT leg (same as swap-collateral's `swapOpts`). */
+    swapOpts: SwapOpts;
+    /** Exponent `wrapper_merge` (redeem) config for the matured PT. */
     rollOpts: RollPtOpts;
     addressLookupTableAccounts?: AddressLookupTableAccount[];
     overrideInferAccounts?: {
@@ -1297,53 +1295,32 @@ interface MakeRollPtTxParams {
         authority?: PublicKey;
     };
     crossbarUrl?: string;
+    /** See `MakeLoopTxParams.swapEngineRunner`. */
+    swapEngineRunner?: SwapEngineRunner;
 }
 /**
- * High-level Exponent config for {@link makeRollPtTx} — the roll's analog of `swapOpts`.
- *
- * `makeRollPtTx` resolves the matured `merge` and (by default) builds the `strip` buy leg
- * internally from these addresses, so the caller never assembles Exponent accounts/ixs.
- * For a non-strip venue, supply a pre-built buy leg via {@link RollPtOpts.buy} (the analog
- * of `makeLoopTx`'s `swapEngineRunner` override).
+ * Exponent redeem config for {@link makeRollPtTx}. `makeRollPtTx` resolves the matured vault's
+ * `wrapper_merge` accounts internally from these addresses — the caller never assembles
+ * Exponent accounts/ixs. The buy leg is the swap engine (`swapOpts`), not part of this.
  */
 interface RollPtOpts {
-    /** The matured PT's Exponent `MarketTwo` — used to resolve `merge` (one of market/vault required). */
+    /** The matured PT's Exponent `MarketTwo` — its `vault` is read (one of market/vault required). */
     maturedMarket?: PublicKey;
     /** …or the matured vault directly. */
     maturedVault?: PublicKey;
     /**
-     * The successor (active) vault to `strip` PT_new from — one of vault/market required for
-     * the default strip buy leg (ignored when {@link RollPtOpts.buy} is provided).
+     * The vault's underlying **base** token (e.g. bulkSOL) — the token `wrapper_merge` redeems
+     * the SY into and the swap leg consumes. Required: it isn't stored on the vault.
      */
-    successorVault?: PublicKey;
-    /** …or the successor market (its vault is read). */
-    successorMarket?: PublicKey;
+    baseMint: PublicKey;
+    /** Token program for the base mint (defaults to the classic Token program). */
+    baseTokenProgram?: PublicKey;
     /**
      * Optional dedicated PT-roll address lookup table (fetched internally) that compresses the
-     * strip flashloan's two SY-CPI account sets back under the tx size limit
+     * `wrapper_merge` + swap flashloan back under the tx size limit
      * (see `examples/create-pt-roll-lut.ts`).
      */
     lookupTable?: PublicKey;
-    /**
-     * Slippage/rounding buffer in basis points applied to the strip's SY-in and the minted-PT
-     * deposit floor, so on-chain merge rounding / SY-rate lag never short the strip. Default 10.
-     */
-    slippageBps?: number;
-    /**
-     * Escape hatch: a pre-built SY→PT_new buy leg (e.g. legacy `MarketTwo` `trade_pt`, CLMM)
-     * to use instead of the internal `strip`. When set, `successorVault`/`successorMarket` and
-     * the internal strip build are skipped. The buy must spend from the merge's SY account
-     * (`mergeAccounts.sySrcDstAta`) and deliver ≥ `ptOutNative` PT to the owner's PT ATA.
-     */
-    buy?: {
-        instructions: TransactionInstruction[];
-        /** ATA creates etc. — placed in the setup tx, not the flashloan. */
-        setupInstructions?: TransactionInstruction[];
-        /** LUTs the buy instructions reference. */
-        lookupTables?: AddressLookupTableAccount[];
-        /** Native PT the buy guarantees — the deposit amount (byte-patched). */
-        ptOutNative: bigint;
-    };
 }
 interface MakeSwapDebtTxParams {
     program: MarginfiProgram;
@@ -3391,15 +3368,17 @@ declare function makeSwapDebtTx(params: MakeSwapDebtTxParams): Promise<{
 }>;
 
 /**
- * Roll a matured Exponent PT collateral position into its next-maturity PT, in one
- * flash-loan-wrapped bundle — entirely within Exponent, no unwrap, no external swap:
+ * Roll a matured Exponent PT collateral position into its next-maturity PT, so the **full
+ * deposit ends up as new PT** (no leftover), in one flash-loan-wrapped bundle:
  *
- *   withdraw PT_old → Exponent `merge` (PT_old → SY) → SY → PT_new buy → deposit PT_new
+ *   withdraw PT_old → Exponent `wrapper_merge` (PT_old → underlying base, e.g. bulkSOL)
+ *     → swap-engine (base → PT_new, Titan/Jupiter) → deposit PT_new
  *
- * The caller passes high-level config (`rollOpts`: the matured + successor markets); this
- * resolves the `merge` and (by default) builds the `strip` buy leg internally — the same
- * way `makeLoopTx`/`makeSwapCollateralTx` internalize their swap. For a non-strip venue
- * (e.g. legacy `MarketTwo` `trade_pt`), pass a pre-built buy leg via `rollOpts.buy`.
+ * Structurally `makeSwapCollateralTx` with a `wrapper_merge` leg in front: the matured PT is
+ * redeemed to a normal, swappable base token (never the un-swappable SY), then the existing
+ * multi-provider swap engine buys the new PT. The caller passes the matured Exponent
+ * market/vault + base token (`rollOpts`) and the swap config (`swapOpts`); everything Exponent
+ * is resolved internally. The buy is bounded by the new PT's market depth.
  */
 declare function makeRollPtTx(params: MakeRollPtTxParams): Promise<{
     transactions: ExtendedV0Transaction[];
@@ -5223,9 +5202,10 @@ declare class MarginfiAccount implements MarginfiAccountType {
     /**
      * Creates a transaction to roll a matured Exponent PT collateral position into its
      * next-maturity PT, in one flash-loan-wrapped bundle
-     * (withdraw PT_old → merge → buy PT_new → deposit). See {@link makeRollPtTx}.
+     * (withdraw PT_old → `wrapper_merge` to base → swap-engine buy PT_new → deposit).
+     * See {@link makeRollPtTx}.
      *
-     * @param params - Roll-PT parameters (`withdrawOpts`/`depositOpts`/`rollOpts`).
+     * @param params - Roll-PT parameters (`withdrawOpts`/`depositOpts`/`swapOpts`/`rollOpts`).
      */
     makeRollPtTx(params: Omit<MakeRollPtTxParams, "marginfiAccount">): Promise<{
         transactions: ExtendedV0Transaction[];
@@ -5595,12 +5575,12 @@ declare class MarginfiAccountWrapper {
     }>;
     /**
      * Rolls a matured Exponent PT collateral position into its next-maturity PT, with
-     * auto-injected client data (withdraw PT_old → merge → buy PT_new → deposit, flash-loan
-     * wrapped). The buy leg is venue-agnostic — supplied via `rollOpts.buyInstructions`.
+     * auto-injected client data (withdraw PT_old → `wrapper_merge` to base → swap-engine buy
+     * PT_new → deposit, flash-loan wrapped). The full deposit ends up as new PT.
      *
      * Auto-injects: program, marginfiAccount, bankMap, oraclePrices, bankMetadataMap, addressLookupTables
      *
-     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, rollOpts, etc.)
+     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, swapOpts, rollOpts, etc.)
      */
     makeRollPtTx(params: Omit<MakeRollPtTxParams, "program" | "marginfiAccount" | "bankMap" | "oraclePrices" | "bankMetadataMap" | "addressLookupTableAccounts">): Promise<{
         transactions: ExtendedV0Transaction[];