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

package/dist/index.d.cts

@@ -1254,16 +1254,14 @@ interface MakeSwapCollateralTxParams {
  * 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)
+ *   1. withdraw the old PT, then Exponent `merge` (redeem PT → SY, post-maturity, 1:1)
+ *   2. buy the new PT with that SY directly on the successor's **CLMM** (`MarketThree`) PT/SY
+ *      pool via `trade_pt` — no base-token round-trip, no external aggregator
  *   3. deposit the new PT.
  *
- * 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.
+ * The buy is liquidity-bounded by the successor pool's depth. The SY → PT price is quoted by
+ * simulating the redeem + trade (reading the CLMM `TradePtEvent.amount_out`), so the deposit
+ * is sized to the guaranteed minimum out.
  */
 interface MakeRollPtTxParams {
     program: MarginfiProgram;
@@ -1285,9 +1283,7 @@ interface MakeRollPtTxParams {
         depositBank: BankType;
         tokenProgram: PublicKey;
     };
-    /** 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. */
+    /** Exponent redeem (`merge`) + successor-CLMM buy config for the matured PT. */
     rollOpts: RollPtOpts;
     addressLookupTableAccounts?: AddressLookupTableAccount[];
     overrideInferAccounts?: {
@@ -1295,30 +1291,27 @@ interface MakeRollPtTxParams {
         authority?: PublicKey;
     };
     crossbarUrl?: string;
-    /** See `MakeLoopTxParams.swapEngineRunner`. */
-    swapEngineRunner?: SwapEngineRunner;
 }
 /**
- * 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.
+ * Exponent roll config for {@link makeRollPtTx}. `makeRollPtTx` resolves the matured vault's
+ * `merge` accounts and the successor pool's CLMM `trade_pt` accounts internally from these
+ * addresses — the caller never assembles Exponent accounts/ixs.
  */
 interface RollPtOpts {
     /** 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 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.
-     */
-    baseMint: PublicKey;
-    /** Token program for the base mint (defaults to the classic Token program). */
-    baseTokenProgram?: PublicKey;
+    /** The successor maturity's **CLMM** (`MarketThree`) pool — where the new PT trades (SY → PT). */
+    successorMarket: PublicKey;
+    /** Slippage tolerance (bps) for the SY → PT CLMM swap. Defaults to 50. */
+    slippageBps?: number;
+    /** Token program for the shared SY mint (defaults to the classic Token program). */
+    syTokenProgram?: PublicKey;
     /**
      * Optional dedicated PT-roll address lookup table (fetched internally) that compresses the
-     * `wrapper_merge` + swap flashloan back under the tx size limit
-     * (see `examples/create-pt-roll-lut.ts`).
+     * merge + CLMM-swap flashloan bytes (see `examples/create-pt-roll-lut.ts`). Account *locks*
+     * are already bounded by the compact, fixed CLMM footprint.
      */
     lookupTable?: PublicKey;
 }
@@ -3371,14 +3364,16 @@ declare function makeSwapDebtTx(params: MakeSwapDebtTxParams): Promise<{
  * 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 `wrapper_merge` (PT_old → underlying base, e.g. bulkSOL)
- *     → swap-engine (base → PT_new, Titan/Jupiter) → deposit PT_new
+ *   withdraw PT_old → Exponent `merge` (PT_old → SY) → CLMM `trade_pt` (SY → PT_new)
+ *     → deposit PT_new
  *
- * 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.
+ * The matured PT is redeemed 1:1 to its SY, then the successor PT is bought **directly on its
+ * CLMM (`MarketThree`) PT/SY pool** — no base-token round-trip and no external aggregator. The
+ * newer maturities (e.g. October bulkSOL) only list a CLMM pool (no `MarketTwo`, no order
+ * book), and the CLMM uses a single `ticks` account, so the swap is a fixed, compact account
+ * set regardless of trade size. The caller passes the matured Exponent market/vault + the
+ * successor CLMM pool (`rollOpts`); everything Exponent is resolved internally. The buy is
+ * bounded by the pool's depth.
  */
 declare function makeRollPtTx(params: MakeRollPtTxParams): Promise<{
     transactions: ExtendedV0Transaction[];
@@ -5580,7 +5575,7 @@ declare class MarginfiAccountWrapper {
      *
      * Auto-injects: program, marginfiAccount, bankMap, oraclePrices, bankMetadataMap, addressLookupTables
      *
-     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, swapOpts, rollOpts, etc.)
+     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, rollOpts, etc.)
      */
     makeRollPtTx(params: Omit<MakeRollPtTxParams, "program" | "marginfiAccount" | "bankMap" | "oraclePrices" | "bankMetadataMap" | "addressLookupTableAccounts">): Promise<{
         transactions: ExtendedV0Transaction[];

package/dist/index.d.ts

@@ -1254,16 +1254,14 @@ interface MakeSwapCollateralTxParams {
  * 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)
+ *   1. withdraw the old PT, then Exponent `merge` (redeem PT → SY, post-maturity, 1:1)
+ *   2. buy the new PT with that SY directly on the successor's **CLMM** (`MarketThree`) PT/SY
+ *      pool via `trade_pt` — no base-token round-trip, no external aggregator
  *   3. deposit the new PT.
  *
- * 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.
+ * The buy is liquidity-bounded by the successor pool's depth. The SY → PT price is quoted by
+ * simulating the redeem + trade (reading the CLMM `TradePtEvent.amount_out`), so the deposit
+ * is sized to the guaranteed minimum out.
  */
 interface MakeRollPtTxParams {
     program: MarginfiProgram;
@@ -1285,9 +1283,7 @@ interface MakeRollPtTxParams {
         depositBank: BankType;
         tokenProgram: PublicKey;
     };
-    /** 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. */
+    /** Exponent redeem (`merge`) + successor-CLMM buy config for the matured PT. */
     rollOpts: RollPtOpts;
     addressLookupTableAccounts?: AddressLookupTableAccount[];
     overrideInferAccounts?: {
@@ -1295,30 +1291,27 @@ interface MakeRollPtTxParams {
         authority?: PublicKey;
     };
     crossbarUrl?: string;
-    /** See `MakeLoopTxParams.swapEngineRunner`. */
-    swapEngineRunner?: SwapEngineRunner;
 }
 /**
- * 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.
+ * Exponent roll config for {@link makeRollPtTx}. `makeRollPtTx` resolves the matured vault's
+ * `merge` accounts and the successor pool's CLMM `trade_pt` accounts internally from these
+ * addresses — the caller never assembles Exponent accounts/ixs.
  */
 interface RollPtOpts {
     /** 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 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.
-     */
-    baseMint: PublicKey;
-    /** Token program for the base mint (defaults to the classic Token program). */
-    baseTokenProgram?: PublicKey;
+    /** The successor maturity's **CLMM** (`MarketThree`) pool — where the new PT trades (SY → PT). */
+    successorMarket: PublicKey;
+    /** Slippage tolerance (bps) for the SY → PT CLMM swap. Defaults to 50. */
+    slippageBps?: number;
+    /** Token program for the shared SY mint (defaults to the classic Token program). */
+    syTokenProgram?: PublicKey;
     /**
      * Optional dedicated PT-roll address lookup table (fetched internally) that compresses the
-     * `wrapper_merge` + swap flashloan back under the tx size limit
-     * (see `examples/create-pt-roll-lut.ts`).
+     * merge + CLMM-swap flashloan bytes (see `examples/create-pt-roll-lut.ts`). Account *locks*
+     * are already bounded by the compact, fixed CLMM footprint.
      */
     lookupTable?: PublicKey;
 }
@@ -3371,14 +3364,16 @@ declare function makeSwapDebtTx(params: MakeSwapDebtTxParams): Promise<{
  * 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 `wrapper_merge` (PT_old → underlying base, e.g. bulkSOL)
- *     → swap-engine (base → PT_new, Titan/Jupiter) → deposit PT_new
+ *   withdraw PT_old → Exponent `merge` (PT_old → SY) → CLMM `trade_pt` (SY → PT_new)
+ *     → deposit PT_new
  *
- * 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.
+ * The matured PT is redeemed 1:1 to its SY, then the successor PT is bought **directly on its
+ * CLMM (`MarketThree`) PT/SY pool** — no base-token round-trip and no external aggregator. The
+ * newer maturities (e.g. October bulkSOL) only list a CLMM pool (no `MarketTwo`, no order
+ * book), and the CLMM uses a single `ticks` account, so the swap is a fixed, compact account
+ * set regardless of trade size. The caller passes the matured Exponent market/vault + the
+ * successor CLMM pool (`rollOpts`); everything Exponent is resolved internally. The buy is
+ * bounded by the pool's depth.
  */
 declare function makeRollPtTx(params: MakeRollPtTxParams): Promise<{
     transactions: ExtendedV0Transaction[];
@@ -5580,7 +5575,7 @@ declare class MarginfiAccountWrapper {
      *
      * Auto-injects: program, marginfiAccount, bankMap, oraclePrices, bankMetadataMap, addressLookupTables
      *
-     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, swapOpts, rollOpts, etc.)
+     * @param params - Roll-PT parameters (user provides: connection, withdrawOpts, depositOpts, rollOpts, etc.)
      */
     makeRollPtTx(params: Omit<MakeRollPtTxParams, "program" | "marginfiAccount" | "bankMap" | "oraclePrices" | "bankMetadataMap" | "addressLookupTableAccounts">): Promise<{
         transactions: ExtendedV0Transaction[];