@aspan/sdk 0.3.1 → 0.4.0

package/dist/index.js

@@ -25,6 +25,7 @@ __export(index_exports, {
   AspanRouterClient: () => AspanRouterClient,
   AspanRouterReadClient: () => AspanRouterReadClient,
   BPS_PRECISION: () => BPS_PRECISION,
+  BSC_ADDRESSES: () => BSC_ADDRESSES,
   DiamondABI: () => DiamondABI,
   PRECISION: () => PRECISION,
   PRICE_PRECISION: () => PRICE_PRECISION,
@@ -1462,11 +1463,11 @@ var import_chains2 = require("viem/chains");
 
 // src/abi/router.ts
 var RouterABI = [
-  // ============ Core Swap+Mint Functions ============
-  // swapAndMintApUSD
+  // ============ Core Functions ============
+  // swapAndMint - unified swap + mint
   {
     type: "function",
-    name: "swapAndMintApUSD",
+    name: "swapAndMint",
     inputs: [
       {
         name: "swapParams",
@@ -1492,45 +1493,26 @@ var RouterABI = [
     ],
     outputs: [
       { name: "lstAmount", type: "uint256" },
-      { name: "apUSDAmount", type: "uint256" }
+      { name: "mintedAmount", type: "uint256" }
     ],
     stateMutability: "payable"
   },
-  // swapAndMintXBNB
+  // swapAndMintDefault - simplified version using default LST
   {
     type: "function",
-    name: "swapAndMintXBNB",
+    name: "swapAndMintDefault",
     inputs: [
-      {
-        name: "swapParams",
-        type: "tuple",
-        components: [
-          { name: "inputToken", type: "address" },
-          { name: "inputAmount", type: "uint256" },
-          { name: "targetLST", type: "address" },
-          { name: "minLSTOut", type: "uint256" },
-          { name: "poolFee", type: "uint24" }
-        ]
-      },
-      {
-        name: "mintParams",
-        type: "tuple",
-        components: [
-          { name: "mintXBNB", type: "bool" },
-          { name: "minMintOut", type: "uint256" },
-          { name: "recipient", type: "address" },
-          { name: "deadline", type: "uint256" }
-        ]
-      }
-    ],
-    outputs: [
-      { name: "lstAmount", type: "uint256" },
-      { name: "xBNBAmount", type: "uint256" }
+      { name: "inputToken", type: "address" },
+      { name: "inputAmount", type: "uint256" },
+      { name: "mintXBNB", type: "bool" },
+      { name: "minMintOut", type: "uint256" },
+      { name: "deadline", type: "uint256" }
     ],
+    outputs: [{ name: "mintedAmount", type: "uint256" }],
     stateMutability: "payable"
   },
   // ============ Stake+Mint Functions ============
-  // stakeAndMint
+  // stakeAndMint - stake BNB directly to LST and mint
   {
     type: "function",
     name: "stakeAndMint",
@@ -1546,144 +1528,59 @@ var RouterABI = [
     ],
     stateMutability: "payable"
   },
-  // stakeAndMintApUSD (simplified)
-  {
-    type: "function",
-    name: "stakeAndMintApUSD",
-    inputs: [{ name: "minMintOut", type: "uint256" }],
-    outputs: [{ name: "apUSDAmount", type: "uint256" }],
-    stateMutability: "payable"
-  },
-  // stakeAndMintXBNB (simplified)
-  {
-    type: "function",
-    name: "stakeAndMintXBNB",
-    inputs: [{ name: "minMintOut", type: "uint256" }],
-    outputs: [{ name: "xBNBAmount", type: "uint256" }],
-    stateMutability: "payable"
-  },
-  // ============ Simplified Swap+Mint Functions ============
-  // swapAndMintApUSDDefault
-  {
-    type: "function",
-    name: "swapAndMintApUSDDefault",
-    inputs: [
-      { name: "inputToken", type: "address" },
-      { name: "inputAmount", type: "uint256" },
-      { name: "minMintOut", type: "uint256" },
-      { name: "deadline", type: "uint256" }
-    ],
-    outputs: [{ name: "apUSDAmount", type: "uint256" }],
-    stateMutability: "payable"
-  },
-  // swapAndMintXBNBDefault
-  {
-    type: "function",
-    name: "swapAndMintXBNBDefault",
-    inputs: [
-      { name: "inputToken", type: "address" },
-      { name: "inputAmount", type: "uint256" },
-      { name: "minMintOut", type: "uint256" },
-      { name: "deadline", type: "uint256" }
-    ],
-    outputs: [{ name: "xBNBAmount", type: "uint256" }],
-    stateMutability: "payable"
-  },
   // ============ Direct Mint/Redeem Functions ============
-  // mintApUSD
+  // mint - unified mint function
   {
     type: "function",
-    name: "mintApUSD",
+    name: "mint",
     inputs: [
       { name: "lst", type: "address" },
       { name: "lstAmount", type: "uint256" },
+      { name: "mintXBNB", type: "bool" },
       { name: "minOut", type: "uint256" }
     ],
-    outputs: [{ name: "apUSDAmount", type: "uint256" }],
+    outputs: [{ name: "mintedAmount", type: "uint256" }],
     stateMutability: "nonpayable"
   },
-  // mintXBNB
+  // redeem - unified redeem function
   {
     type: "function",
-    name: "mintXBNB",
-    inputs: [
-      { name: "lst", type: "address" },
-      { name: "lstAmount", type: "uint256" },
-      { name: "minOut", type: "uint256" }
-    ],
-    outputs: [{ name: "xBNBAmount", type: "uint256" }],
-    stateMutability: "nonpayable"
-  },
-  // redeemApUSD
-  {
-    type: "function",
-    name: "redeemApUSD",
+    name: "redeem",
     inputs: [
       { name: "lst", type: "address" },
-      { name: "apUSDAmount", type: "uint256" },
+      { name: "redeemXBNB", type: "bool" },
+      { name: "amount", type: "uint256" },
       { name: "minOut", type: "uint256" }
     ],
     outputs: [{ name: "lstAmount", type: "uint256" }],
     stateMutability: "nonpayable"
   },
-  // redeemXBNB
+  // ============ Redeem + Swap Functions ============
+  // redeemAndSwap - unified redeem and swap via V3 path
   {
     type: "function",
-    name: "redeemXBNB",
-    inputs: [
-      { name: "lst", type: "address" },
-      { name: "xBNBAmount", type: "uint256" },
-      { name: "minOut", type: "uint256" }
-    ],
-    outputs: [{ name: "lstAmount", type: "uint256" }],
-    stateMutability: "nonpayable"
-  },
-  // ============ Redeem + Swap Functions (V3 path) ============
-  // redeemApUSDAndSwap
-  {
-    type: "function",
-    name: "redeemApUSDAndSwap",
+    name: "redeemAndSwap",
     inputs: [
       { name: "lst", type: "address" },
-      { name: "apUSDAmount", type: "uint256" },
+      { name: "redeemXBNB", type: "bool" },
+      { name: "amount", type: "uint256" },
       { name: "path", type: "bytes" },
       { name: "minOut", type: "uint256" },
-      { name: "deadline", type: "uint256" }
-    ],
-    outputs: [{ name: "outputAmount", type: "uint256" }],
-    stateMutability: "nonpayable"
-  },
-  // redeemXBNBAndSwap
-  {
-    type: "function",
-    name: "redeemXBNBAndSwap",
-    inputs: [
-      { name: "lst", type: "address" },
-      { name: "xBNBAmount", type: "uint256" },
-      { name: "path", type: "bytes" },
-      { name: "minOut", type: "uint256" },
-      { name: "deadline", type: "uint256" }
+      { name: "deadline", type: "uint256" },
+      { name: "unwrapBNB", type: "bool" }
     ],
     outputs: [{ name: "outputAmount", type: "uint256" }],
     stateMutability: "nonpayable"
   },
   // ============ Native Unstake Functions ============
-  // redeemApUSDAndRequestUnstake
+  // redeemAndRequestUnstake - unified unstake request
   {
     type: "function",
-    name: "redeemApUSDAndRequestUnstake",
-    inputs: [{ name: "apUSDAmount", type: "uint256" }],
-    outputs: [
-      { name: "requestIndex", type: "uint256" },
-      { name: "slisBNBAmount", type: "uint256" }
+    name: "redeemAndRequestUnstake",
+    inputs: [
+      { name: "redeemXBNB", type: "bool" },
+      { name: "amount", type: "uint256" }
     ],
-    stateMutability: "nonpayable"
-  },
-  // redeemXBNBAndRequestUnstake
-  {
-    type: "function",
-    name: "redeemXBNBAndRequestUnstake",
-    inputs: [{ name: "xBNBAmount", type: "uint256" }],
     outputs: [
       { name: "requestIndex", type: "uint256" },
       { name: "slisBNBAmount", type: "uint256" }
@@ -1730,43 +1627,25 @@ var RouterABI = [
     outputs: [{ type: "bool" }],
     stateMutability: "view"
   },
-  // Preview functions
+  // Preview functions - unified
   {
     type: "function",
-    name: "previewMintApUSD",
+    name: "previewMint",
     inputs: [
       { name: "lst", type: "address" },
-      { name: "lstAmount", type: "uint256" }
-    ],
-    outputs: [{ name: "apUSDAmount", type: "uint256" }],
-    stateMutability: "view"
-  },
-  {
-    type: "function",
-    name: "previewMintXBNB",
-    inputs: [
-      { name: "lst", type: "address" },
-      { name: "lstAmount", type: "uint256" }
-    ],
-    outputs: [{ name: "xBNBAmount", type: "uint256" }],
-    stateMutability: "view"
-  },
-  {
-    type: "function",
-    name: "previewRedeemApUSD",
-    inputs: [
-      { name: "lst", type: "address" },
-      { name: "apUSDAmount", type: "uint256" }
+      { name: "lstAmount", type: "uint256" },
+      { name: "mintXBNB", type: "bool" }
     ],
-    outputs: [{ name: "lstAmount", type: "uint256" }],
+    outputs: [{ name: "mintedAmount", type: "uint256" }],
     stateMutability: "view"
   },
   {
     type: "function",
-    name: "previewRedeemXBNB",
+    name: "previewRedeem",
     inputs: [
       { name: "lst", type: "address" },
-      { name: "xBNBAmount", type: "uint256" }
+      { name: "redeemXBNB", type: "bool" },
+      { name: "amount", type: "uint256" }
     ],
     outputs: [{ name: "lstAmount", type: "uint256" }],
     stateMutability: "view"
@@ -1848,9 +1727,9 @@ var RouterABI = [
     name: "SwapAndMint",
     inputs: [
       { name: "user", type: "address", indexed: true },
-      { name: "inputToken", type: "address", indexed: false },
+      { name: "inputToken", type: "address", indexed: true },
       { name: "inputAmount", type: "uint256", indexed: false },
-      { name: "lst", type: "address", indexed: false },
+      { name: "targetLST", type: "address", indexed: true },
       { name: "lstAmount", type: "uint256", indexed: false },
       { name: "mintedToken", type: "address", indexed: false },
       { name: "mintedAmount", type: "uint256", indexed: false }
@@ -1862,20 +1741,28 @@ var RouterABI = [
     inputs: [
       { name: "user", type: "address", indexed: true },
       { name: "bnbAmount", type: "uint256", indexed: false },
-      { name: "lst", type: "address", indexed: false },
+      { name: "targetLST", type: "address", indexed: true },
       { name: "lstAmount", type: "uint256", indexed: false },
-      { name: "mintedToken", type: "address", indexed: false },
+      { name: "mintedToken", type: "address", indexed: true },
       { name: "mintedAmount", type: "uint256", indexed: false }
     ]
   },
+  {
+    type: "event",
+    name: "DefaultLSTUpdated",
+    inputs: [
+      { name: "oldLST", type: "address", indexed: true },
+      { name: "newLST", type: "address", indexed: true }
+    ]
+  },
   {
     type: "event",
     name: "Mint",
     inputs: [
       { name: "user", type: "address", indexed: true },
-      { name: "lst", type: "address", indexed: false },
+      { name: "lst", type: "address", indexed: true },
       { name: "lstAmount", type: "uint256", indexed: false },
-      { name: "mintedToken", type: "address", indexed: false },
+      { name: "mintedToken", type: "address", indexed: true },
       { name: "mintedAmount", type: "uint256", indexed: false }
     ]
   },
@@ -1884,9 +1771,9 @@ var RouterABI = [
     name: "Redeem",
     inputs: [
       { name: "user", type: "address", indexed: true },
-      { name: "redeemedToken", type: "address", indexed: false },
+      { name: "redeemedToken", type: "address", indexed: true },
       { name: "redeemedAmount", type: "uint256", indexed: false },
-      { name: "lst", type: "address", indexed: false },
+      { name: "lst", type: "address", indexed: true },
       { name: "lstAmount", type: "uint256", indexed: false }
     ]
   },
@@ -1899,7 +1786,7 @@ var RouterABI = [
       { name: "redeemedAmount", type: "uint256", indexed: false },
       { name: "lst", type: "address", indexed: false },
       { name: "lstAmount", type: "uint256", indexed: false },
-      { name: "outputToken", type: "address", indexed: false },
+      { name: "outputToken", type: "address", indexed: true },
       { name: "outputAmount", type: "uint256", indexed: false }
     ]
   },
@@ -1908,7 +1795,7 @@ var RouterABI = [
     name: "UnstakeRequested",
     inputs: [
       { name: "user", type: "address", indexed: true },
-      { name: "requestIndex", type: "uint256", indexed: false },
+      { name: "requestIndex", type: "uint256", indexed: true },
       { name: "redeemedToken", type: "address", indexed: false },
       { name: "redeemedAmount", type: "uint256", indexed: false },
       { name: "slisBNBAmount", type: "uint256", indexed: false }
@@ -1919,18 +1806,10 @@ var RouterABI = [
     name: "UnstakeClaimed",
     inputs: [
       { name: "user", type: "address", indexed: true },
-      { name: "requestIndex", type: "uint256", indexed: false },
+      { name: "requestIndex", type: "uint256", indexed: true },
       { name: "bnbAmount", type: "uint256", indexed: false }
     ]
   },
-  {
-    type: "event",
-    name: "DefaultLSTUpdated",
-    inputs: [
-      { name: "oldLST", type: "address", indexed: false },
-      { name: "newLST", type: "address", indexed: false }
-    ]
-  },
   {
     type: "event",
     name: "OwnershipTransferred",
@@ -1952,7 +1831,7 @@ var RouterABI = [
   { type: "error", name: "SwapFailed", inputs: [] },
   { type: "error", name: "UnsupportedInputToken", inputs: [] },
   { type: "error", name: "UnsupportedLST", inputs: [] },
-  { type: "error", name: "V3PoolNotFound", inputs: [] },
+  { type: "error", name: "UnsupportedSwapPath", inputs: [] },
   { type: "error", name: "WithdrawalAlreadyClaimed", inputs: [] },
   { type: "error", name: "WithdrawalNotClaimable", inputs: [] },
   { type: "error", name: "ZeroAmount", inputs: [] },
@@ -2021,47 +1900,31 @@ var AspanRouterReadClient = class {
     });
   }
   /**
-   * Preview apUSD mint output for a given LST amount
+   * Preview mint output for a given LST amount
+   * @param lst LST token address
+   * @param lstAmount Amount of LST
+   * @param mintXBNB true = preview xBNB mint, false = preview apUSD mint
    */
-  async previewMintApUSD(lst, lstAmount) {
+  async previewMint(lst, lstAmount, mintXBNB) {
     return this.publicClient.readContract({
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "previewMintApUSD",
-      args: [lst, lstAmount]
+      functionName: "previewMint",
+      args: [lst, lstAmount, mintXBNB]
     });
   }
   /**
-   * Preview xBNB mint output for a given LST amount
+   * Preview redeem output
+   * @param lst LST token to receive
+   * @param redeemXBNB true = redeem xBNB, false = redeem apUSD
+   * @param amount Amount of apUSD/xBNB to redeem
    */
-  async previewMintXBNB(lst, lstAmount) {
+  async previewRedeem(lst, redeemXBNB, amount) {
     return this.publicClient.readContract({
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "previewMintXBNB",
-      args: [lst, lstAmount]
-    });
-  }
-  /**
-   * Preview LST output for redeeming apUSD
-   */
-  async previewRedeemApUSD(lst, apUSDAmount) {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "previewRedeemApUSD",
-      args: [lst, apUSDAmount]
-    });
-  }
-  /**
-   * Preview LST output for redeeming xBNB
-   */
-  async previewRedeemXBNB(lst, xBNBAmount) {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "previewRedeemXBNB",
-      args: [lst, xBNBAmount]
+      functionName: "previewRedeem",
+      args: [lst, redeemXBNB, amount]
     });
   }
   /**
@@ -2167,16 +2030,18 @@ var AspanRouterClient = class extends AspanRouterReadClient {
   }
   // ============ Core Functions ============
   /**
-   * Swap input token to LST and mint apUSD
+   * Swap input token to LST and mint apUSD or xBNB
+   * @param params.swapParams Swap configuration
+   * @param params.mintParams Mint configuration (mintXBNB determines output token)
    */
-  async swapAndMintApUSD(params) {
+  async swapAndMint(params) {
     const value = params.swapParams.inputToken === import_viem2.zeroAddress ? params.swapParams.inputAmount : 0n;
     return this.walletClient.writeContract({
       chain: this.chain,
       account: this.walletClient.account,
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "swapAndMintApUSD",
+      functionName: "swapAndMint",
       args: [
         {
           inputToken: params.swapParams.inputToken,
@@ -2186,8 +2051,7 @@ var AspanRouterClient = class extends AspanRouterReadClient {
           poolFee: params.swapParams.poolFee
         },
         {
-          mintXBNB: false,
-          // swapAndMintApUSD always mints apUSD
+          mintXBNB: params.mintParams.mintXBNB,
           minMintOut: params.mintParams.minMintOut,
           recipient: params.mintParams.recipient,
           deadline: params.mintParams.deadline
@@ -2197,37 +2061,30 @@ var AspanRouterClient = class extends AspanRouterReadClient {
     });
   }
   /**
-   * Swap input token to LST and mint xBNB
+   * Swap input token and mint using default LST (simplified)
+   * @param params.mintXBNB true = mint xBNB, false = mint apUSD
    */
-  async swapAndMintXBNB(params) {
-    const value = params.swapParams.inputToken === import_viem2.zeroAddress ? params.swapParams.inputAmount : 0n;
+  async swapAndMintDefault(params) {
+    const value = params.inputToken === import_viem2.zeroAddress ? params.value ?? params.inputAmount : 0n;
     return this.walletClient.writeContract({
       chain: this.chain,
       account: this.walletClient.account,
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "swapAndMintXBNB",
+      functionName: "swapAndMintDefault",
       args: [
-        {
-          inputToken: params.swapParams.inputToken,
-          inputAmount: params.swapParams.inputAmount,
-          targetLST: params.swapParams.targetLST,
-          minLSTOut: params.swapParams.minLSTOut,
-          poolFee: params.swapParams.poolFee
-        },
-        {
-          mintXBNB: true,
-          // swapAndMintXBNB always mints xBNB
-          minMintOut: params.mintParams.minMintOut,
-          recipient: params.mintParams.recipient,
-          deadline: params.mintParams.deadline
-        }
+        params.inputToken,
+        params.inputAmount,
+        params.mintXBNB,
+        params.minMintOut,
+        params.deadline
       ],
       value
     });
   }
   /**
    * Stake native BNB directly to LST and mint
+   * @param params.isXBNB true = mint xBNB, false = mint apUSD
    */
   async stakeAndMint(params) {
     return this.walletClient.writeContract({
@@ -2245,194 +2102,73 @@ var AspanRouterClient = class extends AspanRouterReadClient {
       value: params.value
     });
   }
-  // ============ Simplified Functions ============
-  /**
-   * Swap input token and mint apUSD using default LST
-   */
-  async swapAndMintApUSDDefault(params) {
-    const value = params.inputToken === import_viem2.zeroAddress ? params.value ?? params.inputAmount : 0n;
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "swapAndMintApUSDDefault",
-      args: [
-        params.inputToken,
-        params.inputAmount,
-        params.minMintOut,
-        params.deadline
-      ],
-      value
-    });
-  }
-  /**
-   * Swap input token and mint xBNB using default LST
-   */
-  async swapAndMintXBNBDefault(params) {
-    const value = params.inputToken === import_viem2.zeroAddress ? params.value ?? params.inputAmount : 0n;
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "swapAndMintXBNBDefault",
-      args: [
-        params.inputToken,
-        params.inputAmount,
-        params.minMintOut,
-        params.deadline
-      ],
-      value
-    });
-  }
-  /**
-   * Stake native BNB and mint apUSD using default LST
-   */
-  async stakeAndMintApUSD(minMintOut, value) {
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "stakeAndMintApUSD",
-      args: [minMintOut],
-      value
-    });
-  }
-  /**
-   * Stake native BNB and mint xBNB using default LST
-   */
-  async stakeAndMintXBNB(minMintOut, value) {
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "stakeAndMintXBNB",
-      args: [minMintOut],
-      value
-    });
-  }
   // ============ Direct Mint/Redeem Functions ============
   /**
-   * Mint apUSD by providing LST directly (no swap)
+   * Mint apUSD or xBNB by providing LST directly (no swap)
+   * @param params.mintXBNB true = mint xBNB, false = mint apUSD
    */
-  async mintApUSD(params) {
+  async mint(params) {
     return this.walletClient.writeContract({
       chain: this.chain,
       account: this.walletClient.account,
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "mintApUSD",
-      args: [params.lst, params.lstAmount, params.minOut ?? 0n]
+      functionName: "mint",
+      args: [params.lst, params.lstAmount, params.mintXBNB, params.minOut ?? 0n]
     });
   }
   /**
-   * Mint xBNB by providing LST directly (no swap)
+   * Redeem apUSD or xBNB for LST (no swap)
+   * @param params.redeemXBNB true = redeem xBNB, false = redeem apUSD
    */
-  async mintXBNB(params) {
+  async redeem(params) {
     return this.walletClient.writeContract({
       chain: this.chain,
       account: this.walletClient.account,
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "mintXBNB",
-      args: [params.lst, params.lstAmount, params.minOut ?? 0n]
-    });
-  }
-  /**
-   * Redeem apUSD for LST (no swap)
-   */
-  async redeemApUSD(params) {
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "redeemApUSD",
-      args: [params.lst, params.apUSDAmount, params.minOut ?? 0n]
-    });
-  }
-  /**
-   * Redeem xBNB for LST (no swap)
-   */
-  async redeemXBNB(params) {
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "redeemXBNB",
-      args: [params.lst, params.xBNBAmount, params.minOut ?? 0n]
+      functionName: "redeem",
+      args: [params.lst, params.redeemXBNB, params.amount, params.minOut ?? 0n]
     });
   }
   // ============ Redeem and Swap Functions ============
   /**
-   * Redeem apUSD and swap LST to output token via V3 path
-   * @param params.path - PancakeSwap V3 encoded path (use encodeV3Path helper)
-   */
-  async redeemApUSDAndSwap(params) {
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "redeemApUSDAndSwap",
-      args: [
-        params.lst,
-        params.amount,
-        params.path,
-        params.minOut,
-        params.deadline
-      ]
-    });
-  }
-  /**
-   * Redeem xBNB and swap LST to output token via V3 path
-   * @param params.path - PancakeSwap V3 encoded path (use encodeV3Path helper)
+   * Redeem apUSD/xBNB and swap LST to output token via V3 path
+   * @param params.redeemXBNB true = redeem xBNB, false = redeem apUSD
+   * @param params.path PancakeSwap V3 encoded path (use encodeV3Path helper)
+   * @param params.unwrapBNB If true and output is WBNB, unwrap to native BNB
    */
-  async redeemXBNBAndSwap(params) {
+  async redeemAndSwap(params) {
     return this.walletClient.writeContract({
       chain: this.chain,
       account: this.walletClient.account,
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "redeemXBNBAndSwap",
+      functionName: "redeemAndSwap",
       args: [
         params.lst,
+        params.redeemXBNB,
         params.amount,
         params.path,
         params.minOut,
-        params.deadline
+        params.deadline,
+        params.unwrapBNB
       ]
     });
   }
   // ============ Native Unstake Functions ============
   /**
-   * Redeem apUSD and request native unstake from Lista (starts unbonding period)
+   * Redeem apUSD/xBNB and request native unstake from Lista (starts unbonding period)
+   * @param params.redeemXBNB true = redeem xBNB, false = redeem apUSD
    */
-  async redeemApUSDAndRequestUnstake(apUSDAmount) {
+  async redeemAndRequestUnstake(params) {
     return this.walletClient.writeContract({
       chain: this.chain,
       account: this.walletClient.account,
       address: this.routerAddress,
       abi: RouterABI,
-      functionName: "redeemApUSDAndRequestUnstake",
-      args: [apUSDAmount]
-    });
-  }
-  /**
-   * Redeem xBNB and request native unstake from Lista (starts unbonding period)
-   */
-  async redeemXBNBAndRequestUnstake(xBNBAmount) {
-    return this.walletClient.writeContract({
-      chain: this.chain,
-      account: this.walletClient.account,
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "redeemXBNBAndRequestUnstake",
-      args: [xBNBAmount]
+      functionName: "redeemAndRequestUnstake",
+      args: [params.redeemXBNB, params.amount]
     });
   }
   /**
@@ -2504,6 +2240,21 @@ function encodeV3Path(tokens, fees) {
 var PRECISION = 10n ** 18n;
 var BPS_PRECISION = 10000n;
 var PRICE_PRECISION = 10n ** 8n;
+var BSC_ADDRESSES = {
+  diamond: "0x10d25Ae0690533e0BA9E64EC7ae77dbD4fE8A46f",
+  router: "0x813d3D1A3154950E2f1d8718305426a335A974A9",
+  apUSD: "0x1977097E2E5697A6DD91b6732F368a14F50f6B3d",
+  xBNB: "0xB78eB4d5928bAb158Eb23c3154544084cD2661d5",
+  sApUSD: "0xE2BE739C4aA4126ee72D612d9548C38B1B0e5A1b",
+  // LSTs
+  slisBNB: "0xB0b84D294e0C75A6abe60171b70edEb2EFd14A1B",
+  asBNB: "0x77734e70b6E88b4d82fE632a168EDf6e700912b6",
+  wclisBNB: "0x439faaC2229559121C4Ad4fd8B3FE13Dff038046",
+  // Stablecoins
+  USDT: "0x55d398326f99059fF775485246999027B3197955",
+  USDC: "0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d",
+  WBNB: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"
+};
 function formatAmount(amount, decimals = 4) {
   const divisor = 10n ** BigInt(18 - decimals);
   const scaled = amount / divisor;
@@ -2542,6 +2293,7 @@ function calculateAPY(previousRate, currentRate, periodDays) {
   AspanRouterClient,
   AspanRouterReadClient,
   BPS_PRECISION,
+  BSC_ADDRESSES,
   DiamondABI,
   PRECISION,
   PRICE_PRECISION,