@alephium/powfi-sdk 0.0.1-rc.2 → 0.0.1-rc.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alephium/powfi-sdk",
-  "version": "0.0.1-rc.2",
-  "description": "Typescript SDK for Alephium PoWFi",
+  "version": "0.0.1-rc.21",
+  "description": "Typescript SDK for Alephium Powfi",
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",
   "types": "./lib/index.d.ts",
@@ -44,24 +44,25 @@
     "defi",
     "blockchain",
     "sdk",
-    "zetamarkets"
+    "powfi"
   ],
-  "author": "Zeta Markets",
-  "license": "MIT",
+  "author": "Powfi",
+  "license": "LGPL-3.0-only",
   "repository": {
     "type": "git",
-    "url": "https://github.com/zetamarkets/zeta-alephium-sdk.git"
+    "url": "https://github.com/alephium/powfi.git"
   },
   "dependencies": {
     "@alephium/token-list": "0.0.20",
-    "@alephium/web3": "^2.0.8",
+    "@alephium/web3": "^2.0.11",
     "decimal.js": "^10.6.0"
   },
   "devDependencies": {
     "clmm": "workspace:*",
     "cpmm": "workspace:*",
     "staking": "workspace:*",
-    "@alephium/web3-test": "^v2.0.8",
+    "@alephium/web3-test": "^v2.0.11",
+    "@alephium/web3-wallet": "^v2.0.11",
     "@types/jest": "^29.5.12",
     "@typescript-eslint/eslint-plugin": "^6.17.0",
     "@typescript-eslint/parser": "^6.17.0",

package/src/clmm/clmm.ts

@@ -1,5 +1,6 @@
 import type { SignExecuteScriptTxResult, Token } from '@alephium/web3';
 import {
+  ALPH_TOKEN_ID,
   addressFromContractId,
   binToHex,
   DUST_AMOUNT,
@@ -8,28 +9,27 @@ import {
   codec,
   encodePrimitiveValues,
   groupOfAddress,
-  ALPH_TOKEN_ID,
 } from '@alephium/web3';
 import { loadDeployments } from 'clmm/artifacts/ts/deployments';
 import ModuleBase from '../moduleBase';
-import type { Zeta } from '../zeta';
+import type { Powfi } from '../powfi';
 import type {
-  AddLiquidity,
+  ClmmAddLiquidityRequest,
   ClmmConfig,
-  CollectProtocolFees,
-  CollectTokens,
-  LiquidityDistribution,
-  RemoveLiquidity,
-  SimulateSwap,
-  ClmmSwapParams,
+  ClmmCollectProtocolFeesRequest,
+  ClmmCollectTokensRequest,
+  ClmmExtendRewardsRequest,
+  ClmmSimulateSwapQuote,
+  ClmmPositionInfoRequest,
   ClmmPoolContractState,
   ClmmPoolConfig,
-  SetRewardParams,
-  ExtendRewards,
-  PositionPath,
+  ClmmSetRewardParamsRequest,
+  ClmmSimulateSwapParams,
+  ClmmSwapRequest,
+  ClmmRemoveLiquidityRequest,
   ClmmPositionInfo,
 } from './types';
-import type { PoolInstance, PoolTypes } from 'clmm/artifacts/ts';
+import type { PoolInstance, PoolTypes, PositionManagerInstance, PositionManagerTypes } from 'clmm/artifacts/ts';
 import {
   CreateLiquidPool,
   Pool,
@@ -47,7 +47,7 @@ export class ClmmModule extends ModuleBase {
   private config: ClmmConfig;
   private configsByIndex = new Map<bigint, ClmmPoolConfig>();
 
-  constructor(scope: Zeta) {
+  constructor(scope: Powfi) {
     super({ scope, moduleName: 'ClmmModule' });
 
     this.config = this._getClmmConfig();
@@ -151,7 +151,6 @@ export class ClmmModule extends ModuleBase {
       const { token0, token1 } = state.fields;
 
       const balance = await this.scope.nodeProvider.addresses.getAddressesAddressBalance(poolAddress);
-
       const getBalance = (tokenId: string) =>
         tokenId === ALPH_TOKEN_ID
           ? BigInt(balance.balance)
@@ -274,8 +273,15 @@ export class ClmmModule extends ModuleBase {
   }
 
   async addLiquidity(
-    p: AddLiquidity,
+    p: ClmmAddLiquidityRequest,
   ): Promise<{ positionId: string; result: SignExecuteScriptTxResult }> {
+    const [positionId, positionManager, params] = await this.getAddLiquidityParams(p);
+    return await this.addLiquidityFromParams(positionId, positionManager, params);
+  }
+
+  async getAddLiquidityParams(
+    p: ClmmAddLiquidityRequest,
+  ): Promise<[string, PositionManagerInstance, PositionManagerTypes.SignExecuteMethodParams<'addLiquidity'>]> {
     const poolAddress = this.getPoolAddress(p.token0, p.token1, p.configIndex);
     const pool = Pool.at(poolAddress);
     const positionManagerAddress = addressFromContractId(this.config.positionManagerId);
@@ -298,48 +304,47 @@ export class ClmmModule extends ModuleBase {
         owner: normalizedOwner,
       },
     });
-    const currentTick = TickUtils.getTickAtSqrtRatio(sqrtPriceX96);
-    const minTick = currentTick - p.slippage;
-    const maxTick = currentTick + p.slippage;
-    const minSqrtPriceX96 = TickUtils.getSqrtRatioAtTick(minTick);
-    const maxSqrtPriceX96 = TickUtils.getSqrtRatioAtTick(maxTick);
+    const minSqrtPriceX96 = TickUtils.getSqrtPriceLimitX96(sqrtPriceX96, p.slippage, true);
+    const maxSqrtPriceX96 = TickUtils.getSqrtPriceLimitX96(sqrtPriceX96, p.slippage, false);
 
-    const liquidity = ClmmLiquidityUtils.getLiquidityFromAmounts(
-      sqrtPriceX96,
+    const minLiquidity = ClmmLiquidityUtils.getLiquidityFromAmounts(
+      minSqrtPriceX96,
       sqrtRatioAX96,
       sqrtRatioBX96,
       p.amount0,
       p.amount1,
     );
-    const [spotAmount0, spotAmount1] = ClmmLiquidityUtils.getAmountsForLiquidity(
-      sqrtPriceX96,
+    const [, minAmount1] = ClmmLiquidityUtils.getAmountsForLiquidity(
+      minSqrtPriceX96,
       sqrtRatioAX96,
       sqrtRatioBX96,
-      -liquidity,
+      -minLiquidity,
     );
-    const [minAmount0, minAmount1] = ClmmLiquidityUtils.getAmountsForLiquidity(
-      minSqrtPriceX96,
+    const maxLiquidity = ClmmLiquidityUtils.getLiquidityFromAmounts(
+      maxSqrtPriceX96,
       sqrtRatioAX96,
       sqrtRatioBX96,
-      -liquidity,
+      p.amount0,
+      p.amount1,
     );
-    const [maxAmount0, maxAmount1] = ClmmLiquidityUtils.getAmountsForLiquidity(
+    const [maxAmount0] = ClmmLiquidityUtils.getAmountsForLiquidity(
       maxSqrtPriceX96,
       sqrtRatioAX96,
       sqrtRatioBX96,
-      -liquidity,
+      -maxLiquidity,
     );
 
     const positionId = PoolUtils.getPositionId(poolAddress, owner, p.tickLower, p.tickUpper);
     const tokens: Token[] = [
-      { id: p.token0, amount: -minAmount0 },
-      { id: p.token1, amount: -maxAmount1 },
+      { id: p.token0, amount: p.amount0 },
+      { id: p.token1, amount: p.amount1 },
     ];
 
     if (p.existingPosition) {
       tokens.push({ id: positionId, amount: 1n });
     }
-    const result = await positionManager.transact.addLiquidity({
+
+    const params = {
       signer: this.scope.signer,
       args: {
         payer: normalizedPayer,
@@ -350,21 +355,32 @@ export class ClmmModule extends ModuleBase {
           owner: normalizedOwner,
           tickLower: p.tickLower,
           tickUpper: p.tickUpper,
-          amount0Desired: -spotAmount0,
-          amount1Desired: -spotAmount1,
+          amount0Desired: p.amount0,
+          amount1Desired: p.amount1,
           amount0Min: -maxAmount0,
           amount1Min: -minAmount1,
         },
       },
       tokens,
-      attoAlphAmount: deposit,
-    });
+      attoAlphAmount: this.getAddLiquidityAttoAlphAmount(p.token0, p.token1),
+      dustAmount: deposit,
+      positionId,
+    };
+    return [positionId, positionManager, params];
+  }
+
+  async addLiquidityFromParams(
+    positionId: string,
+    positionManager: PositionManagerInstance,
+    params: PositionManagerTypes.SignExecuteMethodParams<'addLiquidity'>,
+  ): Promise<{ positionId: string; result: SignExecuteScriptTxResult }> {
 
+    const result = await positionManager.transact.addLiquidity(params);
     return { positionId, result };
   }
 
   async removeLiquidity(
-    p: RemoveLiquidity,
+    p: ClmmRemoveLiquidityRequest,
   ): Promise<{ positionId: string; result: SignExecuteScriptTxResult }> {
     const poolAddress = this.getPoolAddress(p.token0, p.token1, p.configIndex);
     const positionManagerAddress = addressFromContractId(this.config.positionManagerId);
@@ -404,13 +420,13 @@ export class ClmmModule extends ModuleBase {
     return { positionId, result };
   }
 
-  async positionInfo({ poolId, ...args }: PositionPath): Promise<ClmmPositionInfo> {
+  async positionInfo({ poolId, ...args }: ClmmPositionInfoRequest): Promise<ClmmPositionInfo> {
     const pool = Pool.at(addressFromContractId(poolId));
     const { returns } = await pool.view.positionInfo({ args });
     return returns;
   }
   async collectTokens(
-    p: CollectTokens,
+    p: ClmmCollectTokensRequest,
   ): Promise<{ positionId: string; result: SignExecuteScriptTxResult }> {
     const poolAddress = this.getPoolAddress(p.token0, p.token1, p.configIndex);
     const positionId = PoolUtils.getPositionId(poolAddress, p.owner, p.tickLower, p.tickUpper);
@@ -473,7 +489,7 @@ export class ClmmModule extends ModuleBase {
     return index;
   }
 
-  async simulateSwap(p: SimulateSwap): Promise<LiquidityDistribution> {
+  async simulateSwap(p: ClmmSimulateSwapParams): Promise<ClmmSimulateSwapQuote> {
     const poolAddress = this.getPoolAddress(p.token0, p.token1, p.configIndex);
     const pool = Pool.at(poolAddress);
     const result = await pool.view.simulateSwap({
@@ -502,7 +518,7 @@ export class ClmmModule extends ModuleBase {
     };
   }
 
-  async swap(p: ClmmSwapParams): Promise<SignExecuteScriptTxResult> {
+  async swap(p: ClmmSwapRequest): Promise<SignExecuteScriptTxResult> {
     const configIndex = p.routePlan[0];
     const pool = this.getPool(p.token0, p.token1, configIndex);
     const poolState = await pool.fetchState();
@@ -524,12 +540,14 @@ export class ClmmModule extends ModuleBase {
         sqrtPriceLimitX96,
         data: '',
       },
-      tokens: [{ id: tokenIn, amount: p.amount }],
+      tokens: [{ id: tokenIn, amount: p.amountIn }],
       attoAlphAmount: DUST_AMOUNT * 2n,
     });
   }
 
-  async collectProtocolFees(p: CollectProtocolFees): Promise<SignExecuteScriptTxResult> {
+  async collectProtocolFees(
+    p: ClmmCollectProtocolFeesRequest,
+  ): Promise<SignExecuteScriptTxResult> {
     const poolFactoryAddress = addressFromContractId(this.config.factoryId);
     const poolFactory = PoolFactory.at(poolFactoryAddress);
     const result = await poolFactory.transact.collectProtocolFees({
@@ -544,7 +562,7 @@ export class ClmmModule extends ModuleBase {
     return result;
   }
 
-  async setRewardParams(p: SetRewardParams): Promise<SignExecuteScriptTxResult> {
+  async setRewardParams(p: ClmmSetRewardParamsRequest): Promise<SignExecuteScriptTxResult> {
     const poolFactoryAddress = addressFromContractId(this.config.factoryId);
     const poolFactory = PoolFactory.at(poolFactoryAddress);
     const index = p.rewardToken === p.token0 ? 0n : p.rewardToken === p.token1 ? 1n : 2n;
@@ -567,7 +585,7 @@ export class ClmmModule extends ModuleBase {
     return result;
   }
 
-  async extendRewards(p: ExtendRewards): Promise<SignExecuteScriptTxResult> {
+  async extendRewards(p: ClmmExtendRewardsRequest): Promise<SignExecuteScriptTxResult> {
     const poolAddress = this.getPoolAddress(p.token0, p.token1, p.configIndex);
     const pool = Pool.at(poolAddress);
     const index = p.rewardToken === p.token0 ? 0n : p.rewardToken === p.token1 ? 1n : 2n;
@@ -584,6 +602,11 @@ export class ClmmModule extends ModuleBase {
     return result;
   }
 
+  private getAddLiquidityAttoAlphAmount(token0Id: string, token1Id: string): bigint {
+    const nonAlphTokenCount = [token0Id, token1Id].filter((tokenId) => tokenId !== ALPH_TOKEN_ID).length;
+    return BigInt(nonAlphTokenCount) * DUST_AMOUNT;
+  }
+
   private _getClmmConfig(): ClmmConfig {
     const networkId = this.scope.network.id;
     try {

package/src/clmm/liquidity.ts

@@ -147,7 +147,7 @@ export class ClmmLiquidityUtils {
     if (zeroForOne) {
       return this.getToken0Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity);
     } else {
-      return this.getToken1Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity);
+      return this.getToken1Delta(sqrtRatioBX96, sqrtRatioAX96, liquidity);
     }
   }
 

package/src/clmm/pool.ts

@@ -7,7 +7,7 @@ import {
 } from '@alephium/web3';
 import { Pool } from 'clmm/artifacts/ts/Pool';
 import { TickUtils } from './tick';
-import type { LiquidityDistribution } from './types';
+import type { ClmmSimulateSwapQuote } from './types';
 import { ClmmLiquidityUtils } from './liquidity';
 import { MathUtil } from '../common/math';
 import { normalizeAddress } from '../common';
@@ -38,16 +38,16 @@ export class PoolUtils {
     amount: bigint,
     feePips: bigint,
   ): [bigint, bigint, bigint, bigint] {
-    const zeroForOne = sqrtPriceX96 < sqrtPriceTargetX96;
-    const exactIn = amount > 0n;
+    const zeroForOne = sqrtPriceX96 >= sqrtPriceTargetX96;
+    const exactIn = amount >= 0n;
     let amountIn = 0n;
     let amountOut = 0n;
     let feeAmount = 0n;
     let sqrtPriceNextX96 = 0n;
     if (exactIn) {
       amountIn = -ClmmLiquidityUtils.getAmountDelta(
-        sqrtPriceX96,
         sqrtPriceTargetX96,
+        sqrtPriceX96,
         -liquidity,
         zeroForOne,
       );
@@ -68,44 +68,40 @@ export class PoolUtils {
         sqrtPriceTargetX96,
         sqrtPriceX96,
         liquidity,
-        zeroForOne,
+        !zeroForOne,
       );
       const sqrtPriceRealTargetX96 = TickUtils.getNextSqrtPrice(
         sqrtPriceX96,
         liquidity,
         amount,
-        zeroForOne,
+        !zeroForOne,
       );
       sqrtPriceNextX96 = -amount >= amountOut ? sqrtPriceTargetX96 : sqrtPriceRealTargetX96;
     }
     const max = sqrtPriceTargetX96 == sqrtPriceNextX96;
     if (zeroForOne) {
-      const amountIn2 = -ClmmLiquidityUtils.getAmountDelta(
+      const amountIn2 = -ClmmLiquidityUtils.getToken0Delta(
         sqrtPriceNextX96,
         sqrtPriceX96,
         -liquidity,
-        zeroForOne,
       );
-      const amountOut2 = ClmmLiquidityUtils.getAmountDelta(
+      const amountOut2 = ClmmLiquidityUtils.getToken1Delta(
         sqrtPriceNextX96,
         sqrtPriceX96,
         liquidity,
-        zeroForOne,
       );
       amountIn = max && exactIn ? amountIn : amountIn2;
       amountOut = max && !exactIn ? amountOut : amountOut2;
     } else {
-      const amountIn2 = -ClmmLiquidityUtils.getAmountDelta(
+      const amountIn2 = -ClmmLiquidityUtils.getToken1Delta(
         sqrtPriceX96,
         sqrtPriceNextX96,
         -liquidity,
-        zeroForOne,
       );
-      const amountOut2 = ClmmLiquidityUtils.getAmountDelta(
+      const amountOut2 = ClmmLiquidityUtils.getToken0Delta(
         sqrtPriceX96,
         sqrtPriceNextX96,
         liquidity,
-        zeroForOne,
       );
       amountIn = max && exactIn ? amountIn : amountIn2;
       amountOut = max && !exactIn ? amountOut : amountOut2;
@@ -115,24 +111,25 @@ export class PoolUtils {
     if (exactIn && sqrtPriceNextX96 != sqrtPriceTargetX96) {
       feeAmount = amount - amountIn;
     } else {
-      feeAmount = MathUtil.divFloor(amountIn * feePips, Pool.consts.MAX_PIPS - feePips);
+      feeAmount = -MathUtil.alphDiv(-amountIn * feePips, Pool.consts.MAX_PIPS - feePips);
     }
 
     return [sqrtPriceNextX96, amountIn, amountOut, feeAmount];
   }
 
   static offlineSwap(
-    liqDist: LiquidityDistribution,
+    liqDist: ClmmSimulateSwapQuote,
     amountSpecified: bigint,
     sqrtPriceX96: bigint,
   ): bigint {
     const exactIn = amountSpecified > 0n;
     let amountCalculated = 0n;
+    let liquidity = liqDist.liquidity;
     for (const row of liqDist.rows) {
       const [sqrtPriceNextX96, amountIn, amountOut, feeAmount] = this.computeSwapStep(
         sqrtPriceX96,
         row.sqrtPriceX96,
-        liqDist.liquidity,
+        liquidity,
         amountSpecified,
         liqDist.fee,
       );
@@ -144,6 +141,7 @@ export class PoolUtils {
         amountCalculated += amountIn + feeAmount;
       }
       sqrtPriceX96 = sqrtPriceNextX96;
+      liquidity = row.liquidity;
     }
     return amountCalculated;
   }

package/src/clmm/tick.ts

@@ -247,19 +247,6 @@ export class TickUtils {
     return this.getPriceFromTick(tick, tokenBase, tokenQuote, baseIn);
   }
 
-  static getNextSqrtPrice(
-    sqrtPriceX96: bigint,
-    liquidity: bigint,
-    amount: bigint,
-    zeroForOne: boolean,
-  ): bigint {
-    if (zeroForOne) {
-      return this.getNextSqrtPriceFromAmount0(sqrtPriceX96, liquidity, amount);
-    } else {
-      return this.getNextSqrtPriceFromAmount1(sqrtPriceX96, liquidity, amount);
-    }
-  }
-
   static getNextSqrtPriceFromAmount0(
     sqrtPriceX96: bigint,
     liquidity: bigint,
@@ -267,11 +254,11 @@ export class TickUtils {
   ): bigint {
     const numerator1 = liquidity * Q96;
     const product = amount * sqrtPriceX96;
-    if (product >= numerator1) {
+    const denominator = numerator1 - product;
+    if (denominator <= 0n) {
       throw new Error('Amount0 exceeds available liquidity for the swap');
     }
-    const denominator = numerator1 - product;
-    return MathUtil.alphDiv(numerator1 * sqrtPriceX96, denominator);
+    return -MathUtil.alphDiv(-numerator1 * sqrtPriceX96, denominator);
   }
 
   static getNextSqrtPriceFromAmount1(
@@ -283,9 +270,22 @@ export class TickUtils {
     return sqrtPriceX96 + quotient;
   }
 
+  static getNextSqrtPrice(
+    sqrtPX96: bigint,
+    liquidity: bigint,
+    amount: bigint,
+    zeroForOne: boolean,
+  ): bigint {
+    if (zeroForOne) {
+      return this.getNextSqrtPriceFromAmount0(sqrtPX96, liquidity, amount);
+    } else {
+      return this.getNextSqrtPriceFromAmount1(sqrtPX96, liquidity, amount);
+    }
+  }
+
   static getSqrtPriceLimitX96(sqrtPriceX96: bigint, slippage: bigint, zeroForOne: boolean): bigint {
-    if (slippage <= 0n || slippage >= BPS) {
-      throw new Error('slippageBps must be in (0, 10000)');
+    if (slippage < 0n || slippage >= BPS) {
+      throw new Error('slippageBps must be in [0, 10000)');
     }
 
     const [minBound, maxBound] = this.getSqrtPriceX96Bounds(sqrtPriceX96, slippage);
@@ -311,21 +311,9 @@ export class TickUtils {
     if (slippage < 0n || slippage >= BPS) {
       throw new Error('Invalid slippageBps; must be in [0, 10000)');
     }
-    const numMinus = (BPS - slippage) * Q128;
-    const numPlus = (BPS + slippage) * Q128;
-    const den = BPS * Q128;
-    const factorMinusQ96 = MathUtil.mulDivFloor(
-      MathUtil.sqrt(numMinus) * Q96,
-      1n,
-      MathUtil.sqrt(den),
-    );
-    const factorPlusQ96 = MathUtil.mulDivFloor(
-      MathUtil.sqrt(numPlus) * Q96,
-      1n,
-      MathUtil.sqrt(den),
-    );
-    const minSqrtPriceX96 = MathUtil.mulDivFloor(sqrtPriceX96, factorMinusQ96, Q96);
-    const maxSqrtPriceX96 = (sqrtPriceX96 * factorPlusQ96 + Q96 - 1n) / Q96;
+    const price = sqrtPriceX96 * sqrtPriceX96;
+    const minSqrtPriceX96 = MathUtil.sqrt(price * (BPS - slippage) / BPS);
+    const maxSqrtPriceX96 = MathUtil.sqrt(price * (BPS + slippage) / BPS);
     return [minSqrtPriceX96, maxSqrtPriceX96];
   }
 

package/src/clmm/types.ts

@@ -10,15 +10,16 @@ export interface ClmmConfig {
   accountRoot: string;
 }
 
-export interface ClmmSwapParams {
+export interface ClmmSwapRequest {
   token0: string;
   token1: string;
   amount: bigint;
+  amountIn: bigint;
   slippage: bigint;
   routePlan: bigint[];
 }
 
-export interface SimulateSwap {
+export interface ClmmSimulateSwapParams {
   configIndex: bigint;
   token0: string;
   token1: string;
@@ -31,7 +32,7 @@ export interface LiquidityForPrice {
   sqrtPriceX96: bigint;
 }
 
-export interface LiquidityDistribution {
+export interface ClmmSimulateSwapQuote {
   baseSqrtPriceX96: bigint;
   sqrtPriceX96: bigint;
   liquidity: bigint;
@@ -39,7 +40,7 @@ export interface LiquidityDistribution {
   rows: Array<LiquidityForPrice>;
 }
 
-export interface AddLiquidity {
+export interface ClmmAddLiquidityRequest {
   token0: string;
   token1: string;
   configIndex: bigint;
@@ -52,7 +53,7 @@ export interface AddLiquidity {
   existingPosition?: boolean;
 }
 
-export interface RemoveLiquidity {
+export interface ClmmRemoveLiquidityRequest {
   token0: string;
   token1: string;
   configIndex: bigint;
@@ -65,7 +66,7 @@ export interface RemoveLiquidity {
   otherAmountMax: bigint;
 }
 
-export interface CollectTokens {
+export interface ClmmCollectTokensRequest {
   token0: string;
   token1: string;
   configIndex: bigint;
@@ -78,7 +79,7 @@ export interface CollectTokens {
   amount1Max: bigint;
 }
 
-export interface PositionPath {
+export interface ClmmPositionInfoRequest {
   poolId: string;
   owner: string;
   tickLower: bigint;
@@ -90,14 +91,14 @@ export interface PositionPath {
   acct0: bigint;
 }
 
-export interface CollectProtocolFees {
+export interface ClmmCollectProtocolFeesRequest {
   token0: string;
   token1: string;
   configIndex: bigint;
   recipient: string;
 }
 
-export interface SetRewardParams {
+export interface ClmmSetRewardParamsRequest {
   token0: string;
   token1: string;
   configIndex: bigint;
@@ -108,7 +109,7 @@ export interface SetRewardParams {
   endTime: bigint;
 }
 
-export interface ExtendRewards {
+export interface ClmmExtendRewardsRequest {
   token0: string;
   token1: string;
   configIndex: bigint;
@@ -135,8 +136,7 @@ export interface ClmmPoolConfig {
 
 export const MAX_PIPS = Pool.consts.MAX_PIPS;
 
-
-export type ClmmPositionInfo = PositionInfo
+export type ClmmPositionInfo = PositionInfo;
 
 export interface GetPositionAmountsFromPriceProps {
   sqrtRatioX96: bigint;

package/src/common/error.ts

@@ -1,39 +1,39 @@
-export class ZetaSDKError extends Error {
+export class PowfiSDKError extends Error {
   constructor(message: string, options?: ErrorOptions) {
     super(message, options);
-    this.name = 'ZetaSDKError';
+    this.name = 'PowfiSDKError';
   }
 }
 
-export class InsufficientLiquidityError extends ZetaSDKError {
+export class InsufficientLiquidityError extends PowfiSDKError {
   constructor(message: string = 'Insufficient liquidity') {
     super(message);
     this.name = 'InsufficientLiquidityError';
   }
 }
 
-export class PriceImpactTooHighError extends ZetaSDKError {
+export class PriceImpactTooHighError extends PowfiSDKError {
   constructor(priceImpact: number, maxPriceImpact: number) {
     super(`Price impact too high: ${priceImpact.toFixed(2)}% > ${maxPriceImpact}%`);
     this.name = 'PriceImpactTooHighError';
   }
 }
 
-export class PoolNotFoundError extends ZetaSDKError {
+export class PoolNotFoundError extends PowfiSDKError {
   constructor(poolId: string) {
     super(`Pool does not exist for ${poolId}`);
     this.name = 'PoolNotFoundError';
   }
 }
 
-export class InsufficientBalanceError extends ZetaSDKError {
+export class InsufficientBalanceError extends PowfiSDKError {
   constructor(token: string, required: string, available: string) {
     super(`Not enough ${token} balance. Required: ${required}, Available: ${available}`);
     this.name = 'InsufficientBalanceError';
   }
 }
 
-export class TokenListFetchError extends ZetaSDKError {
+export class TokenListFetchError extends PowfiSDKError {
   public readonly status?: number;
 
   constructor(url: string, options?: { status?: number; cause?: unknown }) {

package/src/common/types.ts

@@ -42,7 +42,7 @@ export const defaultNetworks: Network[] = [
 ];
 export type NetworkOverrides = Partial<Omit<Network, 'id'>>;
 
-export interface ZetaLoadParams {
+export interface PowfiLoadParams {
   networkId: NetworkId;
   signer?: SignerProvider;
   networkOverrides?: NetworkOverrides;