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

package/lib/index.js

@@ -52,6 +52,8 @@ __export(index_exports, {
   NumericUtils: () => NumericUtils,
   PoolNotFoundError: () => PoolNotFoundError,
   PoolUtils: () => PoolUtils,
+  Powfi: () => Powfi,
+  PowfiSDKError: () => PowfiSDKError,
   PriceImpactTooHighError: () => PriceImpactTooHighError,
   StakingContracts: () => ts_exports3,
   StakingModule: () => StakingModule,
@@ -60,8 +62,6 @@ __export(index_exports, {
   TokenModule: () => TokenModule,
   U256_MAX: () => U256_MAX,
   UNLIMITED_AMOUNT: () => UNLIMITED_AMOUNT,
-  Zeta: () => Zeta,
-  ZetaSDKError: () => ZetaSDKError,
   createLogger: () => createLogger,
   decodeContractIdList: () => decodeContractIdList,
   decodeU256List: () => decodeU256List,
@@ -77,7 +77,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/zeta.ts
+// src/powfi.ts
 var import_web348 = require("@alephium/web3");
 
 // src/cpmm/cpmm.ts
@@ -4133,7 +4133,7 @@ var CreatePair_ral_default = {
 var CreatePairAndAddLiquidity_ral_default = {
   version: "v4.2.5",
   name: "CreatePairAndAddLiquidity",
-  bytecodeTemplate: "0101030001004029{0}7a7a{2}a2{3}0da3{4}0da3{0}{2}{3}{4}100c{1}0106{1}{3}{4}44cc1700{0}7a{3}{5}a3{4}{6}a3{0}{5}{6}0f0d1600010e18",
+  bytecodeTemplate: "010103001d004145{1}{3}{4}44cc1700160017011600c54c4117{7}{0}47cc17021602c5194c05{0}0d0c{7}d465b302f9131e17031367101704160416032b1705160416052a17060c0e1601010817081707{5}16082c{6}16072c334c406b{6}16082a1709160516092c170a160616072c16092c170b160416072c{5}16082c{6}16072c2b2c170c160b160b2c10160a2c160c2c2a170d160d0d0d16010105160b2b0e160a2c2d170e1605160e2c16082c160416072c1605160e2c2a2d170f1607160e2a17101608160f2b1711{6}16102c1611911712{0}{3}160ea3{0}{0}160e0c0c160f13060c16010110{0}7a{3}1612a3{4}{6}a3{0}1612{6}0f0d1601010e184a4083{6}16072c{5}16082c334c406b{5}16072a1713160516132c1714160616082c16132c1715160416082c{6}16072c{5}16082c2b2c1716161516152c1016142c16162c2a171716170d0d1601010516152b0e16142c2d1718160516182c16072c160416082c160516182c2a2d1719160716192b171a160816182a171b{5}161b2c161a91171c{0}{4}1618a3{0}{0}0c161816190c13060c16010110{0}7a{3}{5}a3{4}161ca3{0}{5}161c0f0d1601010e184a10{0}7a{3}{5}a3{4}{6}a3{0}{5}{6}0f0d1601010e184a4023{0}7a7a{2}a2{3}0da3{4}0da3{0}{2}{3}{4}100c{1}0106{0}7a{3}{5}a3{4}{6}a3{0}{5}{6}0f0d1601010e18",
   fieldsSig: {
     names: [
       "payer",
@@ -4142,7 +4142,8 @@ var CreatePairAndAddLiquidity_ral_default = {
       "token0Id",
       "token1Id",
       "amount0",
-      "amount1"
+      "amount1",
+      "dexAccount"
     ],
     types: [
       "Address",
@@ -4151,7 +4152,8 @@ var CreatePairAndAddLiquidity_ral_default = {
       "ByteVec",
       "ByteVec",
       "U256",
-      "U256"
+      "U256",
+      "IDexAccount"
     ],
     isMutable: [
       false,
@@ -4160,6 +4162,7 @@ var CreatePairAndAddLiquidity_ral_default = {
       false,
       false,
       false,
+      false,
       false
     ]
   },
@@ -4754,37 +4757,37 @@ var MAX_PRICE_IMPACT = 5;
 var MINIMUM_LIQUIDITY = 1000n;
 
 // src/common/error.ts
-var ZetaSDKError = class extends Error {
+var PowfiSDKError = class extends Error {
   constructor(message, options) {
     super(message, options);
-    this.name = "ZetaSDKError";
+    this.name = "PowfiSDKError";
   }
 };
-var InsufficientLiquidityError = class extends ZetaSDKError {
+var InsufficientLiquidityError = class extends PowfiSDKError {
   constructor(message = "Insufficient liquidity") {
     super(message);
     this.name = "InsufficientLiquidityError";
   }
 };
-var PriceImpactTooHighError = class extends ZetaSDKError {
+var PriceImpactTooHighError = class extends PowfiSDKError {
   constructor(priceImpact, maxPriceImpact) {
     super(`Price impact too high: ${priceImpact.toFixed(2)}% > ${maxPriceImpact}%`);
     this.name = "PriceImpactTooHighError";
   }
 };
-var PoolNotFoundError = class extends ZetaSDKError {
+var PoolNotFoundError = class extends PowfiSDKError {
   constructor(poolId) {
     super(`Pool does not exist for ${poolId}`);
     this.name = "PoolNotFoundError";
   }
 };
-var InsufficientBalanceError = class extends ZetaSDKError {
+var InsufficientBalanceError = class extends PowfiSDKError {
   constructor(token, required, available) {
     super(`Not enough ${token} balance. Required: ${required}, Available: ${available}`);
     this.name = "InsufficientBalanceError";
   }
 };
-var TokenListFetchError = class extends ZetaSDKError {
+var TokenListFetchError = class extends PowfiSDKError {
   status;
   constructor(url, options) {
     const statusPart = options?.status !== void 0 ? ` (status ${options.status})` : "";
@@ -6384,14 +6387,14 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     if (!this.scope.signer) {
       throw new Error("Signer is required for swap operation");
     }
-    const poolState = await this.getPoolState(params.tokenIn.id, params.tokenOut.id);
+    const poolState = await this.getPoolState(params.tokenInId, params.tokenOutId);
     const swapDetails = _CpmmModule.computeSwapAmount({
       state: poolState,
-      tokenIn: params.tokenIn,
-      tokenOut: params.tokenOut,
+      tokenInId: params.tokenInId,
+      tokenOutId: params.tokenOutId,
       amountIn: params.amountIn,
       amountOut: params.amountOut,
-      slippage: params.slippage
+      slippageBps: params.slippageBps
     });
     if (swapDetails.priceImpact >= MAX_PRICE_IMPACT) {
       throw new PriceImpactTooHighError(swapDetails.priceImpact, MAX_PRICE_IMPACT);
@@ -6406,7 +6409,7 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
         );
       }
     }
-    const ttl = params.ttl ?? 60;
+    const ttlMinutes = params.ttlMinutes ?? 60;
     if (swapDetails.swapType === "ExactIn") {
       let attoAlphAmount = this.getExtraAlphAmount(
         swapDetails.state.token0Info.id,
@@ -6428,7 +6431,7 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
           tokenInId: swapDetails.tokenInInfo.id,
           amountIn: swapDetails.tokenInAmount,
           amountOutMin: swapDetails.minimalTokenOutAmount,
-          deadline: deadline(ttl)
+          deadline: deadline(ttlMinutes)
         },
         attoAlphAmount,
         tokens
@@ -6455,7 +6458,7 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
           tokenInId: swapDetails.tokenInInfo.id,
           amountInMax: swapDetails.maximalTokenInAmount,
           amountOut: swapDetails.tokenOutAmount,
-          deadline: deadline(ttl)
+          deadline: deadline(ttlMinutes)
         },
         attoAlphAmount,
         tokens
@@ -6467,55 +6470,66 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     if (!this.scope.signer) {
       throw new Error("Signer is required for addLiquidity operation");
     }
-    const { cpmmPoolState, tokenA, tokenB, amountA, amountB, slippage, sender, ttl = 60 } = params;
+    const {
+      poolState,
+      tokenAId,
+      tokenBId,
+      amountA,
+      amountB,
+      slippageBps,
+      sender,
+      ttlMinutes = 60
+    } = params;
+    const tokenAInfo = _CpmmModule.getTokenInfoFromPoolState(poolState, tokenAId, "tokenAId");
+    const tokenBInfo = _CpmmModule.getTokenInfoFromPoolState(poolState, tokenBId, "tokenBId");
     if (amountA === 0n || amountB === 0n) {
       throw new Error("The input amount must be greater than 0");
     }
     if (balances) {
-      const tokenAAvailable = balances.get(tokenA.id) ?? 0n;
+      const tokenAAvailable = balances.get(tokenAInfo.id) ?? 0n;
       if (tokenAAvailable < amountA) {
         throw new InsufficientBalanceError(
-          tokenA.symbol,
-          (0, import_web313.prettifyTokenAmount)(amountA, tokenA.decimals) ?? `${amountA}`,
-          (0, import_web313.prettifyTokenAmount)(tokenAAvailable, tokenA.decimals) ?? `${tokenAAvailable}`
+          tokenAInfo.symbol,
+          (0, import_web313.prettifyTokenAmount)(amountA, tokenAInfo.decimals) ?? `${amountA}`,
+          (0, import_web313.prettifyTokenAmount)(tokenAAvailable, tokenAInfo.decimals) ?? `${tokenAAvailable}`
         );
       }
-      const tokenBAvailable = balances.get(tokenB.id) ?? 0n;
+      const tokenBAvailable = balances.get(tokenBInfo.id) ?? 0n;
       if (tokenBAvailable < amountB) {
         throw new InsufficientBalanceError(
-          tokenB.symbol,
-          (0, import_web313.prettifyTokenAmount)(amountB, tokenB.decimals) ?? `${amountB}`,
-          (0, import_web313.prettifyTokenAmount)(tokenBAvailable, tokenB.decimals) ?? `${tokenBAvailable}`
+          tokenBInfo.symbol,
+          (0, import_web313.prettifyTokenAmount)(amountB, tokenBInfo.decimals) ?? `${amountB}`,
+          (0, import_web313.prettifyTokenAmount)(tokenBAvailable, tokenBInfo.decimals) ?? `${tokenBAvailable}`
         );
       }
     }
-    const isInitial = cpmmPoolState.reserve0 === 0n && cpmmPoolState.reserve1 === 0n;
-    const amountAMin = isInitial ? amountA : _CpmmModule.minimalAmount(amountA, slippage);
-    const amountBMin = isInitial ? amountB : _CpmmModule.minimalAmount(amountB, slippage);
-    const [amount0Desired, amount1Desired, amount0Min, amount1Min] = tokenA.id === cpmmPoolState.token0Info.id ? [amountA, amountB, amountAMin, amountBMin] : [amountB, amountA, amountBMin, amountAMin];
-    const extraAlph = this.getExtraAlphAmount(tokenA.id, tokenB.id);
+    const isInitial = poolState.reserve0 === 0n && poolState.reserve1 === 0n;
+    const amountAMin = isInitial ? amountA : _CpmmModule.minimalAmount(amountA, slippageBps);
+    const amountBMin = isInitial ? amountB : _CpmmModule.minimalAmount(amountB, slippageBps);
+    const [amount0Desired, amount1Desired, amount0Min, amount1Min] = tokenAId === poolState.token0Info.id ? [amountA, amountB, amountAMin, amountBMin] : [amountB, amountA, amountBMin, amountAMin];
+    const extraAlph = this.getExtraAlphAmount(tokenAId, tokenBId);
     let attoAlphAmount = extraAlph + import_web313.DUST_AMOUNT;
     const tokens = [];
-    if (tokenA.id === import_web313.ALPH_TOKEN_ID) {
+    if (tokenAId === import_web313.ALPH_TOKEN_ID) {
       attoAlphAmount += amountA;
-      tokens.push({ id: tokenB.id, amount: amountB });
-    } else if (tokenB.id === import_web313.ALPH_TOKEN_ID) {
+      tokens.push({ id: tokenBId, amount: amountB });
+    } else if (tokenBId === import_web313.ALPH_TOKEN_ID) {
       attoAlphAmount += amountB;
-      tokens.push({ id: tokenA.id, amount: amountA });
+      tokens.push({ id: tokenAId, amount: amountA });
     } else {
-      tokens.push({ id: tokenA.id, amount: amountA }, { id: tokenB.id, amount: amountB });
+      tokens.push({ id: tokenAId, amount: amountA }, { id: tokenBId, amount: amountB });
     }
     const result = await AddLiquidity.execute({
       signer: this.scope.signer,
       initialFields: {
         sender,
         router: this.config.routerId,
-        pair: cpmmPoolState.poolId,
+        pair: poolState.poolId,
         amount0Desired,
         amount1Desired,
         amount0Min,
         amount1Min,
-        deadline: deadline(ttl)
+        deadline: deadline(ttlMinutes)
       },
       attoAlphAmount,
       tokens
@@ -6526,24 +6540,31 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     if (!this.scope.signer) {
       throw new Error("Signer is required for removeLiquidity operation");
     }
-    const { state, liquidity, totalLiquidityAmount, slippage, sender, ttl = 60 } = params;
-    const ownedLiquidity = totalLiquidityAmount ?? state.totalSupply;
-    const details = _CpmmModule.computeRemoveLiquidityAmounts(state, ownedLiquidity, liquidity);
-    const amount0Min = _CpmmModule.minimalAmount(details.amount0, slippage);
-    const amount1Min = _CpmmModule.minimalAmount(details.amount1, slippage);
+    const {
+      poolState,
+      liquidity,
+      totalLiquidityAmount,
+      slippageBps,
+      sender,
+      ttlMinutes = 60
+    } = params;
+    const ownedLiquidity = totalLiquidityAmount ?? poolState.totalSupply;
+    const details = _CpmmModule.computeRemoveLiquidityAmounts(poolState, ownedLiquidity, liquidity);
+    const amount0Min = _CpmmModule.minimalAmount(details.amount0, slippageBps);
+    const amount1Min = _CpmmModule.minimalAmount(details.amount1, slippageBps);
     const result = await RemoveLiquidity.execute({
       signer: this.scope.signer,
       initialFields: {
         sender,
         router: this.config.routerId,
-        pairId: state.poolId,
+        pairId: poolState.poolId,
         liquidity,
         amount0Min,
         amount1Min,
-        deadline: deadline(ttl)
+        deadline: deadline(ttlMinutes)
       },
-      attoAlphAmount: this.getExtraAlphAmount(state.token0Info.id, state.token1Info.id) + import_web313.DUST_AMOUNT,
-      tokens: [{ id: state.poolId, amount: liquidity }]
+      attoAlphAmount: this.getExtraAlphAmount(poolState.token0Info.id, poolState.token1Info.id) + import_web313.DUST_AMOUNT,
+      tokens: [{ id: poolState.poolId, amount: liquidity }]
     });
     return result;
   }
@@ -6561,11 +6582,13 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     if (!this.scope.signer) {
       throw new Error("Signer is required for createPool operation");
     }
-    const { tokenA, tokenB, sender, tokenAAmount, tokenBAmount } = params;
-    const poolId = this.getPoolId(tokenA.id, tokenB.id);
-    if (tokenAAmount !== void 0 && tokenBAmount !== void 0) {
-      const [token0Id, token1Id] = sortTokens(tokenA.id, tokenB.id);
-      const [amount0, amount1] = token0Id === tokenA.id ? [tokenAAmount, tokenBAmount] : [tokenBAmount, tokenAAmount];
+    const { tokenAId, tokenBId, sender, initialLiquidity } = params;
+    const poolId = this.getPoolId(tokenAId, tokenBId);
+    if (initialLiquidity) {
+      const { tokenAAmount, tokenBAmount } = initialLiquidity;
+      const [token0Id, token1Id] = sortTokens(tokenAId, tokenBId);
+      const [amount0, amount1] = token0Id === tokenAId ? [tokenAAmount, tokenBAmount] : [tokenBAmount, tokenAAmount];
+      const state = await TokenPairFactory.at((0, import_web313.addressFromContractId)(this.config.factoryId)).fetchState();
       const result2 = await CreatePairAndAddLiquidity.execute({
         signer: this.scope.signer,
         initialFields: {
@@ -6575,9 +6598,10 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
           token0Id,
           token1Id,
           amount0,
-          amount1
+          amount1,
+          dexAccount: state.fields.dexAccount0
         },
-        attoAlphAmount: import_web313.ONE_ALPH + this.getExtraAlphAmount(tokenA.id, tokenB.id),
+        attoAlphAmount: import_web313.ONE_ALPH + this.getExtraAlphAmount(tokenAId, tokenBId),
         tokens: [
           { id: token0Id, amount: amount0 },
           { id: token1Id, amount: amount1 }
@@ -6591,13 +6615,13 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
         payer: sender,
         factory: this.config.factoryId,
         alphAmount: import_web313.ONE_ALPH,
-        tokenAId: tokenA.id,
-        tokenBId: tokenB.id
+        tokenAId,
+        tokenBId
       },
-      attoAlphAmount: import_web313.ONE_ALPH + this.getExtraAlphAmount(tokenA.id, tokenB.id),
+      attoAlphAmount: import_web313.ONE_ALPH + this.getExtraAlphAmount(tokenAId, tokenBId),
       tokens: [
-        { id: tokenA.id, amount: 1n },
-        { id: tokenB.id, amount: 1n }
+        { id: tokenAId, amount: 1n },
+        { id: tokenBId, amount: 1n }
       ]
     });
     return { ...result, poolId };
@@ -6616,17 +6640,19 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     }
   }
   static computeSwapAmount(params) {
-    const { state, tokenIn, tokenOut, amountIn, amountOut, slippage } = params;
+    const { state, tokenInId, tokenOutId, amountIn, amountOut, slippageBps } = params;
+    const tokenInInfo = this.getTokenInfoFromPoolState(state, tokenInId, "tokenInId");
+    const tokenOutInfo = this.getTokenInfoFromPoolState(state, tokenOutId, "tokenOutId");
     let swapType;
     let tokenInAmount;
     let tokenOutAmount;
     if (amountIn !== void 0) {
       swapType = "ExactIn";
       tokenInAmount = amountIn;
-      tokenOutAmount = _CpmmModule.getAmountOut(state, tokenIn.id, amountIn);
+      tokenOutAmount = _CpmmModule.getAmountOut(state, tokenInInfo.id, amountIn);
     } else if (amountOut !== void 0) {
       swapType = "ExactOut";
-      tokenInAmount = _CpmmModule.getAmountIn(state, tokenOut.id, amountOut);
+      tokenInAmount = _CpmmModule.getAmountIn(state, tokenOutInfo.id, amountOut);
       tokenOutAmount = amountOut;
     } else {
       throw new Error("Either amountIn or amountOut must be specified");
@@ -6634,7 +6660,7 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     const priceImpact = this.calcPriceImpact(
       state.reserve0,
       state.reserve1,
-      tokenIn.id,
+      tokenInInfo.id,
       state.token0Info.id,
       tokenInAmount,
       tokenOutAmount
@@ -6642,29 +6668,29 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
     return {
       swapType,
       state,
-      tokenInInfo: tokenIn,
-      tokenOutInfo: tokenOut,
+      tokenInInfo,
+      tokenOutInfo,
       tokenInAmount,
       tokenOutAmount,
       priceImpact,
-      minimalTokenOutAmount: swapType === "ExactIn" ? this.minimalAmount(tokenOutAmount, slippage) : void 0,
-      maximalTokenInAmount: swapType === "ExactOut" ? this.maximalAmount(tokenInAmount, slippage) : void 0
+      minimalTokenOutAmount: swapType === "ExactIn" ? this.minimalAmount(tokenOutAmount, slippageBps) : void 0,
+      maximalTokenInAmount: swapType === "ExactOut" ? this.maximalAmount(tokenInAmount, slippageBps) : void 0
     };
   }
   static computeLiquidityAmounts(params) {
-    const { state, tokenA, tokenB, amountA, amountB, inputType = "TokenA" } = params;
-    if (!state) {
-      if (!amountA || !amountB) {
+    const { poolState, tokenAId, tokenBId, amountA, amountB, inputType = "TokenA" } = params;
+    if (!poolState) {
+      if (amountA === void 0 || amountB === void 0) {
         throw new Error("Both amountA and amountB are required for initial liquidity");
       }
-      return this.getInitLiquidityDetails(tokenA.id, tokenB.id, amountA, amountB);
+      return this.getInitLiquidityDetails(tokenAId, tokenBId, amountA, amountB);
     }
-    const inputTokenId = inputType === "TokenA" ? tokenA.id : tokenB.id;
+    const inputTokenId = inputType === "TokenA" ? tokenAId : tokenBId;
     const inputAmount = inputType === "TokenA" ? amountA : amountB;
-    if (!inputAmount) {
+    if (inputAmount === void 0) {
       throw new Error(`Amount for ${inputType} is required`);
     }
-    return this.getLiquidityDetails(state, inputTokenId, inputAmount, inputType);
+    return this.getLiquidityDetails(poolState, inputTokenId, inputAmount, inputType);
   }
   static computeRemoveLiquidityAmounts(state, totalLiquidity, liquidityToRemove) {
     if (liquidityToRemove > totalLiquidity) {
@@ -6755,6 +6781,15 @@ var CpmmModule = class _CpmmModule extends ModuleBase {
       sharePercentage: 100
     };
   }
+  static getTokenInfoFromPoolState(state, tokenId, tokenLabel) {
+    if (state.token0Info.id === tokenId) {
+      return state.token0Info;
+    }
+    if (state.token1Info.id === tokenId) {
+      return state.token1Info;
+    }
+    throw new Error(`Unknown ${tokenLabel} ${tokenId} for pool ${state.poolId}`);
+  }
   static _getAmountOut(amountIn, reserveIn, reserveOut) {
     const amountInExcludeFee = 997n * amountIn;
     const numerator = amountInExcludeFee * reserveOut;
@@ -6851,7 +6886,7 @@ var import_web315 = require("@alephium/web3");
 
 // ../clmm/artifacts/BitmapWord.ral.json
 var BitmapWord_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "BitmapWord",
   bytecode: "020540d641c941e7429442aa0000010201406516000c301340967b0c1701160013cd0100000000000000000000000000000000344c0816001340803c170016011340802a1701160013c5010000000000000000344c0816001340403c170016011340402a1701160013c10100000000344c08160013203c1700160113202a170116001380010000344c08160013103c1700160113102a17011600134100344c08160013083c1700160113082a170116001310344c081600103c17001601102a1701160010344c0816000e3c170016010e2a170116000e344c0416010d2a17011601020000010201407c16000c301340977b1340ff1701160013ccffffffffffffffffffffffffffffffff380c334c0516011340802b17014a0416001340803c1700160013c4ffffffffffffffff380c334c0516011340402b17014a0416001340403c1700160013c0ffffffff380c334c05160113202b17014a04160013203c17001600138000ffff380c334c05160113102b17014a04160013103c170016001340ff380c334c05160113082b17014a04160013083c17001600130f380c334c051601102b17014a041600103c170016000f380c334c0516010e2b17014a0416000e3c170016000d380c334c0416010d2b170116010201000101000dd3ff38d2a3ce00b4451341937ba0000d160000043b3aa1000100030f024064d327ef6f9f16014c40301600000417030d16033b0d2b0d16033b2a1704a000160438170516050c30170616064c0e16001603160500002b3f20160221170716071606024a0a160016033f20160221170816081606024a40311600000417090d16093b0d2b0c0d363a170aa000160a38170b160b0c30170c160c4c0e1600160b000116092b3f1f160221170d160d160c024a0c16001240ff16093f201f160221170e160e160c020000010101091600124100231241001f124100233d02",
   codeHash: "69fd344eb51899a9bdc30ae94beeb2dcfeb2fc312d39116ebe9d208a55293edd",
@@ -7483,7 +7518,7 @@ var import_web316 = require("@alephium/web3");
 
 // ../clmm/artifacts/BitmapWordDeployer.ral.json
 var BitmapWordDeployer_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "BitmapWordDeployer",
   bytecode: "00014026010301040113d3c7309617b41301640c130164170217011600d1a2b316011602af1703160302",
   codeHash: "082de32f22857e094db5658611a1d2ba23e792a7f23a548525e6de2784f2a70b",
@@ -7578,7 +7613,7 @@ var import_web317 = require("@alephium/web3");
 
 // ../clmm/artifacts/DexAccount.ral.json
 var DexAccount_ral_default2 = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "DexAccount",
   bytecode: "0505404b409940b240ca40e60103050800402cd3bd481528b417051600ce0116011602aa16047a0e314dc3170616064313202f4c1816047a0e314dc31603cc17071605160777467a4c0418a0020c304c04a0020d2ba10201000106004029d365b302f9b41701160149191341f47b160047cb17021602c54c06ce000d0d160201024a01ce00170316011603130264a000a001a00213036417051704160147b116041605c11801000101010ad358cbdacfa0020c2f4c03ce00024a0216000201030101000ad3511324a7b4b1a50d2f1341937b1600a10201030202000cd375472acbb4b1a50d2f1341937b16001601a101a100",
   codeHash: "66c27c91033d54a2d3edc97dbc36b35022274ddd8a7b84b724631ac37586ed48",
@@ -7816,7 +7851,7 @@ var import_web318 = require("@alephium/web3");
 
 // ../clmm/artifacts/LiquidityAmountsTest.ral.json
 var LiquidityAmountsTest_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "LiquidityAmountsTest",
   bytecode: "0006402e405240a440d241b441d701000304010dd3b8a5f4fb1600160113c9010000000000000000000000000004170316021603160116002b000402010003030108d364be47fc160213c901000000000000000000000000160116002b00040201000507014027d345f12d7a16001601324c061601160216030000024a1c16001602314c13160016021603000017051601160016040001170616051606314c0216054a011606024a0516011602160400010201000304010ed374e08b3b160213c9010000000000000000000000002c160116002b160100041703160316002d020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200041703160016011602870c334c0416030d2a02160302",
   codeHash: "6a4ba04c81892909e02efe02e9f3ebf139cf27afd40f5fca01f4a9b98a9003da",
@@ -8167,7 +8202,7 @@ var import_web319 = require("@alephium/web3");
 
 // ../clmm/artifacts/LiquidityManagmentTest.ral.json
 var LiquidityManagmentTest_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "LiquidityManagmentTest",
   bytecode: "010e409a40c840ec413e416c424e4271427b429042a642bc42d746564a5201030b16044051d39b20ce13ce00160116024416030009170b160516060e0f160b012e170e170d170c160c160d160e160716080003170f160b160416051606000b171016001610a5171116001601a5171216001602a5171316007a7a16011612a316021613a316101611a31600160416051606160f110e160b01251715171416141609347a4c04181615160a341343527b160f16141615160b0201000304010dd3b8a5f4fb1600160113c9010000000000000000000000000005170316021603160116002b000502010003030108d364be47fc160213c901000000000000000000000000160116002b00050201000507014027d345f12d7a16001601324c061601160216030001024a1c16001602314c13160016021603000117051601160016040002170616051606314c0216054a011606024a0516011602160400020201000304010ed374e08b3b160213c9010000000000000000000000002c160116002b160100051703160316002d020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200051703160016011602870c334c0416030d2a0216030200000101010316004002000003040109160016020007cc17031601160344020000030401091600160116020008170316001603cc02010003030108d37afb14100d1600160116021304640201000405010ad35b19984c160116021603000a170416001604cc020000010301413816000c3f264c061600057c203d4a0216003d1701160112800d89e83d321340ca7b16010d380c304c0213ccfffcb933bd6fad37aa2d162d1a5940014a0113cd0100000000000000000000000000000000170216010e380c304c06160213ccfff97272373d413259a46990580e213a2c1340803c4a0116021702160110380c304c06160213ccfff2e50f5f656932ef12357cf3c7fdcc2c1340803c4a011602170216011308380c304c06160213ccffe5caca7e10e4e61c3624eaa0941cd02c1340803c4a011602170216011310380c304c06160213ccffcb9843d60f6159c9db58835c9266442c1340803c4a011602170216011320380c304c06160213ccff973b41fa98c081472e6896dfb254c02c1340803c4a01160217021601134040380c304c06160213ccff2ea16466c96a3843ec78b326b528612c1340803c4a01160217021601134080380c304c06160213ccfe5dee046a99a2a811c461f1969c30532c1340803c4a01160217021601134100380c304c06160213ccfcbe86c7900a88aedcffc83b479aa3a42c1340803c4a01160217021601134200380c304c06160213ccf987a7253ac413176f2b074cf7815e542c1340803c4a01160217021601134400380c304c06160213ccf3392b0822b70005940c7a398e4b70f32c1340803c4a01160217021601134800380c304c06160213cce7159475a2c29b7443b29c7fa6e889d92c1340803c4a01160217021601135000380c304c06160213ccd097f3bdfd2022b8845ad8f792aa58252c1340803c4a01160217021601136000380c304c06160213cca9f746462d870fdf8a65dc1f90e061e52c1340803c4a011602170216011380004000380c304c06160213cc70d869a156d2a1b890bb3df62baf32f72c1340803c4a011602170216011380008000380c304c06160213cc31be135f97d08fd981231505542fcfa62c1340803c4a011602170216011380010000380c304c06160213cc09aa508b5b7a84e1c677de54f3e99bc92c1340803c4a011602170216011380020000380c304c06160213cb5d6af8dedb81196699c329225ee6042c1340803c4a011602170216011380040000380c304c06160213ca2216e584f5fa1ea926041bedfe982c1340803c4a011602170216011380080000380c304c06160213c8048a170391f7dc42444e8fa22c1340803c4a0116021702160005284c060c0d3616022d4a0116021702160213c1010000000091020100010b0141f2d3c6eb44f3160013c101000276a3347a4c0418160013d0fffd8963efd1fc6a506488495d951d5263988d26311340c97b160013203b1701160117020c1703160213cd01000000000000000000000000000000000d2b334c08160313408039170316021340803c1702160213c50100000000000000000d2b334c08160313404039170316021340403c1702160213c101000000000d2b334c0816031320391703160213203c17021602138000ffff334c0816031310391703160213103c170216021340ff334c0816031308391703160213083c17021602130f334c081603103917031602103c170216020f334c0816030e39170316020e3c170216020d334c0416030d3917031603134080344c071601160313407f2b3c17024a06160113407f16032b3b17021603134080314c0e0c0d3613407f2b16032a0c0d361340403c384a0316031340802b1340403b17040c1705160216022c13407f3c170216021340803c170516041605133f3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133e3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133d3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133c3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133b3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133a3b391704160216053c1702160216022c13407f3c170216021340803c17051604160513393b391704160216053c1702160216022c13407f3c170216021340803c17051604160513383b391704160216053c1702160216022c13407f3c170216021340803c17051604160513373b391704160216053c1702160216022c13407f3c170216021340803c17051604160513363b391704160216053c1702160216022c13407f3c170216021340803c17051604160513353b391704160216053c1702160216022c13407f3c170216021340803c17051604160513343b391704160216053c1702160216022c13407f3c170216021340803c17051604160513333b391704160216053c1702160216022c13407f3c170216021340803c17051604160513323b391704160413c63627a301d71055774c85371706160613dcfffffffffffffffffffffffffffffffffd709b7e5480fba5a50fed5e62ffc556351340803c1707160613ccdb2df09e81959a81455e260799a0632f351340803c170816071380800000314c0316073f4a0616071380ffffff383f128100000020170916081380800000314c0316083f4a0616081380ffffff383f128100000020170a1609160a244c031609024a0a160a000c1600324c03160a024a02160902",
   codeHash: "8824caa1efe83247812dfa7f32a80ae3d4603937df2b062437581ac421fa817d",
@@ -8935,10 +8970,10 @@ var import_web320 = require("@alephium/web3");
 
 // ../clmm/artifacts/Pool.ral.json
 var Pool_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "Pool",
-  bytecode: "4020403609124023403843b747b34916493049ca4a3c4a6c4a9c4ad04afc4b3b4b674c494c6c4c8a4cbc4cd84d0b4d6c4d824d9d4da74dbc4dd24df94e064e1b4e714e854eef4f5f4feb508b512f51b45206524e535c562056ae572f57af57c5589258af597a5a125a4b5bfe5c55010000000102140002010000000102a0000201000101010716000c3413406e7bce0102010002030008160100021702160016024113406d7b0000010301413816000c3f264c061600057c203d4a0216003d1701160112800d89e83d321340ca7b16010d380c304c0213ccfffcb933bd6fad37aa2d162d1a5940014a0113cd0100000000000000000000000000000000170216010e380c304c06160213ccfff97272373d413259a46990580e213a2c1340803c4a0116021702160110380c304c06160213ccfff2e50f5f656932ef12357cf3c7fdcc2c1340803c4a011602170216011308380c304c06160213ccffe5caca7e10e4e61c3624eaa0941cd02c1340803c4a011602170216011310380c304c06160213ccffcb9843d60f6159c9db58835c9266442c1340803c4a011602170216011320380c304c06160213ccff973b41fa98c081472e6896dfb254c02c1340803c4a01160217021601134040380c304c06160213ccff2ea16466c96a3843ec78b326b528612c1340803c4a01160217021601134080380c304c06160213ccfe5dee046a99a2a811c461f1969c30532c1340803c4a01160217021601134100380c304c06160213ccfcbe86c7900a88aedcffc83b479aa3a42c1340803c4a01160217021601134200380c304c06160213ccf987a7253ac413176f2b074cf7815e542c1340803c4a01160217021601134400380c304c06160213ccf3392b0822b70005940c7a398e4b70f32c1340803c4a01160217021601134800380c304c06160213cce7159475a2c29b7443b29c7fa6e889d92c1340803c4a01160217021601135000380c304c06160213ccd097f3bdfd2022b8845ad8f792aa58252c1340803c4a01160217021601136000380c304c06160213cca9f746462d870fdf8a65dc1f90e061e52c1340803c4a011602170216011380004000380c304c06160213cc70d869a156d2a1b890bb3df62baf32f72c1340803c4a011602170216011380008000380c304c06160213cc31be135f97d08fd981231505542fcfa62c1340803c4a011602170216011380010000380c304c06160213cc09aa508b5b7a84e1c677de54f3e99bc92c1340803c4a011602170216011380020000380c304c06160213cb5d6af8dedb81196699c329225ee6042c1340803c4a011602170216011380040000380c304c06160213ca2216e584f5fa1ea926041bedfe982c1340803c4a011602170216011380080000380c304c06160213c8048a170391f7dc42444e8fa22c1340803c4a0116021702160005284c060c0d3616022d4a0116021702160213c1010000000091020100010b0141f2d3c6eb44f3160013c101000276a3347a4c0418160013d0fffd8963efd1fc6a506488495d951d5263988d26311340c97b160013203b1701160117020c1703160213cd01000000000000000000000000000000000d2b334c08160313408039170316021340803c1702160213c50100000000000000000d2b334c08160313404039170316021340403c1702160213c101000000000d2b334c0816031320391703160213203c17021602138000ffff334c0816031310391703160213103c170216021340ff334c0816031308391703160213083c17021602130f334c081603103917031602103c170216020f334c0816030e39170316020e3c170216020d334c0416030d3917031603134080344c071601160313407f2b3c17024a06160113407f16032b3b17021603134080314c0e0c0d3613407f2b16032a0c0d361340403c384a0316031340802b1340403b17040c1705160216022c13407f3c170216021340803c170516041605133f3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133e3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133d3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133c3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133b3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133a3b391704160216053c1702160216022c13407f3c170216021340803c17051604160513393b391704160216053c1702160216022c13407f3c170216021340803c17051604160513383b391704160216053c1702160216022c13407f3c170216021340803c17051604160513373b391704160216053c1702160216022c13407f3c170216021340803c17051604160513363b391704160216053c1702160216022c13407f3c170216021340803c17051604160513353b391704160216053c1702160216022c13407f3c170216021340803c17051604160513343b391704160216053c1702160216022c13407f3c170216021340803c17051604160513333b391704160216053c1702160216022c13407f3c170216021340803c17051604160513323b391704160413c63627a301d71055774c85371706160613dcfffffffffffffffffffffffffffffffffd709b7e5480fba5a50fed5e62ffc556351340803c1707160613ccdb2df09e81959a81455e260799a0632f351340803c170816071380800000314c0316073f4a0616071380ffffff383f128100000020170916081380800000314c0316083f4a0616081380ffffff383f128100000020170a1609160a244c031609024a0a160a00041600324c03160a024a021609020000050d0440c5160016013417051603052917060c17070c17080c17090c170a16064c402316033d13800f424016042b13800f42400010170b16054c0616011600160203000c4a0516001601160203000e1707160b1607344c0216014a0516001602160b1605000a17094a402216054c0616011600160204000e4a0516001601160204000c17081603057c203d1608344c0216014a09160016021603057c203d1605000b1709160116092f170c16054c1e160c7a4c021816064c0216074a0516091600160203000c1707160c7a4c03181606194c0216084a0516091600160204000e17084a1d160c7a4c021816064c0216074a0516001609160203000e1707160c7a4c03181606194c0216084a0516001609160204000c17081606197a4c0818160316083f057c20284c061603057c203d170816067a4c041816091601304c0616033d16072b170a4a071607160413800f424016042b0011170a160916071608160a0200000202010e160016012d160016012e0c2f4c020c4a010d2a020000040901404916020c2f4c0216000216011340603b17041602160037170516034c1c160516022d16002f4c0d1604160535170616061604344c051604160016060011021604160416002d16022a0007024a1d160516022d16002f7a4c041816041605331340dd7b160416052b170716041600160700111708160813d1010000000000000000000000000000000000000000311340e17b1608020000040701402116034c11160213c901000000000000000000000000160100101704160016042a1705160513d1010000000000000000000000000000000000000000311340e17b1605024a0e160213c90100000000000000000000000016010011170616001606331340de7b160016062b0200000404011916000c331340df7b16010c331340e07b16034c07160016011602030008024a061600160116020300090200000404011916000c331340df7b16010c331340e07b16034c07160016011602040009024a061600160116020400080200000406011916021340603b1704160116002b170516034c08160416051601001116000007024a07160416051601001016002d0200000303011b16020b274c0f160016011602057c203d04000c3f057c20024a081600160116023d03000c3f02000004050111160116002b170416034c061602160413c9010000000000000000000000000011024a051602160413c90100000000000000000000000000100200000303011b160205264c0f160016011602057c203d04000e3f057c20024a081600160116023d03000e3f020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200101703160016011602870c334c0416030d2a021603020000010101120e16007a7a1241003a7a05294b033a904a023a221302640200000105011b1600001217011601cb17021602c54c02160202b21301640c130164170417031601ce0416031604c11816020200000103010d1600001217011601cb17021602c54c02160202ce040200000103001e1600ce0a23052413412d7b16007a7ace0a3a7a05294b033a904a023a22170116010013170216010d0c160201020000020602403016007a7ace0a3a7a05294b033a904a023a2216014c02054a01061f170216020014170316021601ce0a0f0e1603010317051704160412bff27618264c0212bff276181704160412800d89e8284c0212800d89e817041604160502010003030108d37afb14100d1600160116021304640201000405010ad35b19984c1601160216030017170416001604cc0200000101010316004002000003040109160016020019cc1703160116034402000003040109160016011602001a170316001603cc0200000202000f16001601261340667b160012bff27618291340677b160112800d89e8271340687b0000010101050c160013026402010001020107d30949c5981600001d17011601cb02000001080240301600001d17011601cb17021602c54c03160204021600a002274c04a00ea00fa0104a030c0c0c170517041703b216001302640c05160316041605130564170717061601ce0316061607c11816020302000003040108160016011602001717031603cb020000030d024039160016011602001717031603cb17041604c54c03160404020c0c0c1709170817070c0c0c170c170b170ab2a0001406414c504800031303640c160716081609160a160b160c13076417061705a0000d2aa1001603ce01160516060d1600c9181604030200000209034047a002a00ea00fa010100f16000101170417031702a002a00ea00fa010100f160101021707170617050c170816080f314c402716087a0f314d130e2ac316087a0f314d0e2a782b16087a0f314d112a783616087a0f314d0e2a7916080d2a17084a7fd5160216031604020000051103404b1602001f170617051603001f17081707ce0b1604040f0d160501001709ce0b1604030f0d16070100170a16097a4b021816064c0216020015160a7a4b021816084c0216030015160516070022170d170c170b1604160b160c160d100f160001041710170f170e16094c0516010d0c16050103160a4c0516010d0c16070103160e160f1610020003050f05405416021603001c560030160016011602160316040023170717061705160405254c403ca004170816020004170916030004170aa0021602264c0b1609160a1604000d170b160b0516051606160702a0021603264c16a001160a1604000d170c1609a0011604000f170d16083f16041f3da104160c160d160516061607021609160a1604000f170e05160e1605160616070205051605160616070201070513024056d3e58379f416011602160300211706170516064c0d16040c2f170716071913406b7b160016014513406c7b16011602160316043f170b170a170917081600160516064c020c4a010da3160516081609160a160b00241710170f170e170d170c160c3d1711160d3d17121600ce061611ac1600ce071612ac1207160116021603160e160f161056750916001601160216031604161116125676161116120201030511024048d39d5023b316011602160316043f057c20170817071706170516011602160300201709160016090da3160916051606160716080024170e170d170c170b170a160a057c203d170f160b057c203d1710160f16100e0c160901051207160116021603160c160d160e56750a16001601160216031604160f161075160f1610020103080c034027d3417830ee160216031604002017081605160616070f0f16080106170b170a1709160016080da316011609160a160b00281206160016011602160316041609160a160b761609160a160b020001040800402ece06ce07ce081706170517040c170716070f314c402216077a0f314d0d2a780c334c12160016077a0f314d102a7816077a0f314d0d2a78ab16070d2a17074a7fda01000418004097d34c88990ba0011704a0021705a00417061601052817070517081605160019001618170906160900045e16030c334c407c16030d2b1703160516000016170b170a160a0004170c1604160c16061601ce0900061710170f170e170d16074c0d1601160e16102a3f2017011608160f3f2017084a0c1601160f3f1f17011608160e16102a3f1f1708160b4c17160a001e17110c0d16110105171216004c051612057c204a011612171316063f16131f3d170616004c04160a06204a01160a1705160d170407160416065f160105244c1f1602430c2f4c0102160016071c4c02ce074a01ce061714160216141607002b171717161817151615160816171603100c16160129024a7f80010307403402416dd3d6407a21160405251340697b560030160405281707a001a002a003170a1709170816034c0c16051608317a4c0418160513c101000276a33313406a7b4a0b16051608337a4c0418160513d0fffd8963efd1fc6a506488495d951d5263988d263113406a7ba00416034c04160a13102e4a03160a103c170c170b1604051608160916034c02a00e4a01a00f160b0c1713171217111710170f170e170d160d05257a4c0418160f1605304c409b1610160300161715171416140004171616034c0416161605314a031616160533171716174c0216054a0116161718160f16181612160dce090006171c171b171a1719160f161416151616161a161b161c1723172217211720171f171e171d1619170f16074c0d160d162116232a3f20170d160e16223f20170e4a0c160d16223f1f170d160e162116232a3f1f170e160c0c334c041623160c2d4a010c1724161316242a171316120c334c091611162316242b13cd0100000000000000000000000000000000161200102a1711160f16202f4c4027161f4c1c161e001e1725a00ea00fa01016031611110d16250104172616034c051626057c204a011626172716123f16271f3d171216034c04161e06204a01161e17104a07160f161d304c03160f000517104a7f5b160fa1011610a1021612a1041613130a2d1728161316282b171316034c071611a10ea01116132aa1114a061611a10fa01216132aa1121604160d201729160e172a160316071d4c041629172a160e172916034c0e160016011602ce0616293dce07162a057c203d16064a0d160016011602ce07162a3dce061629057c203d1606173217311730172f172e172d172c172b16074c0f1600162e162fa3162b162c162d162e162f1630163116321628002d4a1216001602a51733160016021633a3162b162c162d162e162f1630163116321628002c08160016011629162aa001a004a002751629162a020000030d04404116000c13206217030e170416001320132016042a62170516056d1706160171160371311707160716021c170816084c0413c101000276a30d2a4a0313d0fffd8963efd1fc6a506488495d951d5263988d260d2b17091600132016042a16004362170a16074c0416011603444a031603160144170bce00160b1606001b170c16081609160c160a020001091000404716031602414c1e160016031604acce02160047cc1709ce00ce06ce0744ce05001a170a160016031608a3160016031608160a0c110c160901004a40211607160304002b170e170d170c170b16001602a5170f16001602160fa31600b21602160b16043f057c20160c160e13070e160d012a1818160116051606ab00010910004046160016031604acce02160147cc17091609c51340717b1609170ace00ce06ce0744ce05001a170b160016031608a3160016031608160b0c110c160a010016051602414c05160116051606ab4a1a1607160503002b170f170e170d170cb216051606a3b216011602160c16063f160d160f13070e160e012a1818010002020307d3c62bf5cfa0011600000416010004020000020800408716007a0f314d0f2c112ac3170216007a0f314d0f2c112a0d2ac3170316020c2f7a4b041816011602327a4b041816031602324c0102a0040c304c404f160116022b170416007a0f314d0f2c112a0e2ac31705160316022b170616041606314c0516041605160600104a011605170716007a0f314d130e2ac3160713cd0100000000000000000000000000000000a00400102a16007a0f314d130e2ac416007a0f314d0f2c112a0e2ac316072b16007a0f314d0f2c112a0e2ac4160116007a0f314d0f2c112ac400000102000e0c170116010f314c0816011600002f16010d2a17014a340107030a004096d34ca91e1416010f311340727b16020c331340747bce06ce07ce0817051704170316017a0f314d0f2a7817065617071607003016017a0f314d0f2c112a0e2ac3170816017a0f314d0f2c112a0d2ac31607337a4c041816080c331340737b16017a0f314d0f2c112a0d2ac316072b1709160716017a0f314d0f2c112ac416017a0f314d0f2c112a0d2ac316091602160800102a16017a0f314d0f2c112a0d2ac416017a0f314d0f2c112a0e2ac316022a16017a0f314d0f2c112a0e2ac4160016061602ac0107050a004065d375c252e5b4ce00774513406f7b16010f311340727b16040c331340747b56170516021605334c0216024a011605170616061603311340707b16050030ce06ce07ce08170917081707160616017a0f314d0f2c112ac4160316017a0f314d0f2c112a0d2ac416017a0f314d0f2c112a0e2ac316042a16017a0f314d0f2c112a0e2ac4160016017a0f314d13072a781604ac01020103001cd3960b26b3b3ce00411341937ba0111701a01217021600ce061601ab1600ce071602ab0ca1110ca1121208b41600160116026101000840270840d1d300611b5f1601001e17081602001e17091600160116020020170a0c10160a0107170e170d170c170b16081609002217111710170f160100041712160200041713051714051715160b3f1716a0021601264c06161216131616000d17144a14a0021602264c0ba00116131616000d17141612a0011616000f17154a05161216131616000f17150c0c0c171917181717160b0c334c40290c171a161a0f314c4023161a7a0f314d130f2a78161a7a0f314d130c2a782b171b161b160b13cd01000000000000000000000000000000000010161a7a0f314d13172a79161a0d2a171a4a7fd905171c05171d56171e161e16062b171f1607161f2a17201603160b161f2c2a3f1721a0021601264c06161216131621000d171c4a14a0021602264c0ba00116131621000d171c1612a0011621000f171d4a05161216131621000f171da001a00113c901000000000000000000000000001017221622161c3d13c9010000000000000000000000000010161d3d2a1723160416172a1724160516182a17251622162413c901000000000000000000000000001016252a17261614161516171618161916231626162002010000000103d3ee6a5cd514404868747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f616c65706869756d2f746f6b656e2d6c6973742f6d61737465722f636f72652f6d2e6a736f6e02",
-  codeHash: "cdb37fb2772ba9c976a4dc34db15994ecaeef82d8690b9a94c600a81c67f98c4",
+  bytecode: "4020403609124023403843b747b34916493049ca4a3c4a6c4a9c4ad04afc4b3b4b674c494c6c4c8a4cbc4cd84d0b4d6c4d824d9d4da74dbc4dd24df94e064e1b4e714e854eef4f5f4feb508b512f51b4520e52695377563b56c9574a57ca57e058ad58ca59955a2d5a665c195c70010000000102140002010000000102a0000201000101010716000c3413406e7bce0102010002030008160100021702160016024113406d7b0000010301413816000c3f264c061600057c203d4a0216003d1701160112800d89e83d321340ca7b16010d380c304c0213ccfffcb933bd6fad37aa2d162d1a5940014a0113cd0100000000000000000000000000000000170216010e380c304c06160213ccfff97272373d413259a46990580e213a2c1340803c4a0116021702160110380c304c06160213ccfff2e50f5f656932ef12357cf3c7fdcc2c1340803c4a011602170216011308380c304c06160213ccffe5caca7e10e4e61c3624eaa0941cd02c1340803c4a011602170216011310380c304c06160213ccffcb9843d60f6159c9db58835c9266442c1340803c4a011602170216011320380c304c06160213ccff973b41fa98c081472e6896dfb254c02c1340803c4a01160217021601134040380c304c06160213ccff2ea16466c96a3843ec78b326b528612c1340803c4a01160217021601134080380c304c06160213ccfe5dee046a99a2a811c461f1969c30532c1340803c4a01160217021601134100380c304c06160213ccfcbe86c7900a88aedcffc83b479aa3a42c1340803c4a01160217021601134200380c304c06160213ccf987a7253ac413176f2b074cf7815e542c1340803c4a01160217021601134400380c304c06160213ccf3392b0822b70005940c7a398e4b70f32c1340803c4a01160217021601134800380c304c06160213cce7159475a2c29b7443b29c7fa6e889d92c1340803c4a01160217021601135000380c304c06160213ccd097f3bdfd2022b8845ad8f792aa58252c1340803c4a01160217021601136000380c304c06160213cca9f746462d870fdf8a65dc1f90e061e52c1340803c4a011602170216011380004000380c304c06160213cc70d869a156d2a1b890bb3df62baf32f72c1340803c4a011602170216011380008000380c304c06160213cc31be135f97d08fd981231505542fcfa62c1340803c4a011602170216011380010000380c304c06160213cc09aa508b5b7a84e1c677de54f3e99bc92c1340803c4a011602170216011380020000380c304c06160213cb5d6af8dedb81196699c329225ee6042c1340803c4a011602170216011380040000380c304c06160213ca2216e584f5fa1ea926041bedfe982c1340803c4a011602170216011380080000380c304c06160213c8048a170391f7dc42444e8fa22c1340803c4a0116021702160005284c060c0d3616022d4a0116021702160213c1010000000091020100010b0141f2d3c6eb44f3160013c101000276a3347a4c0418160013d0fffd8963efd1fc6a506488495d951d5263988d26311340c97b160013203b1701160117020c1703160213cd01000000000000000000000000000000000d2b334c08160313408039170316021340803c1702160213c50100000000000000000d2b334c08160313404039170316021340403c1702160213c101000000000d2b334c0816031320391703160213203c17021602138000ffff334c0816031310391703160213103c170216021340ff334c0816031308391703160213083c17021602130f334c081603103917031602103c170216020f334c0816030e39170316020e3c170216020d334c0416030d3917031603134080344c071601160313407f2b3c17024a06160113407f16032b3b17021603134080314c0e0c0d3613407f2b16032a0c0d361340403c384a0316031340802b1340403b17040c1705160216022c13407f3c170216021340803c170516041605133f3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133e3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133d3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133c3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133b3b391704160216053c1702160216022c13407f3c170216021340803c170516041605133a3b391704160216053c1702160216022c13407f3c170216021340803c17051604160513393b391704160216053c1702160216022c13407f3c170216021340803c17051604160513383b391704160216053c1702160216022c13407f3c170216021340803c17051604160513373b391704160216053c1702160216022c13407f3c170216021340803c17051604160513363b391704160216053c1702160216022c13407f3c170216021340803c17051604160513353b391704160216053c1702160216022c13407f3c170216021340803c17051604160513343b391704160216053c1702160216022c13407f3c170216021340803c17051604160513333b391704160216053c1702160216022c13407f3c170216021340803c17051604160513323b391704160413c63627a301d71055774c85371706160613dcfffffffffffffffffffffffffffffffffd709b7e5480fba5a50fed5e62ffc556351340803c1707160613ccdb2df09e81959a81455e260799a0632f351340803c170816071380800000314c0316073f4a0616071380ffffff383f128100000020170916081380800000314c0316083f4a0616081380ffffff383f128100000020170a1609160a244c031609024a0a160a00041600324c03160a024a021609020000050d0440c5160016013417051603052917060c17070c17080c17090c170a16064c402316033d13800f424016042b13800f42400010170b16054c0616011600160203000c4a0516001601160203000e1707160b1607344c0216014a0516001602160b1605000a17094a402216054c0616011600160204000e4a0516001601160204000c17081603057c203d1608344c0216014a09160016021603057c203d1605000b1709160116092f170c16054c1e160c7a4c021816064c0216074a0516091600160203000c1707160c7a4c03181606194c0216084a0516091600160204000e17084a1d160c7a4c021816064c0216074a0516001609160203000e1707160c7a4c03181606194c0216084a0516001609160204000c17081606197a4c0818160316083f057c20284c061603057c203d170816067a4c041816091601304c0616033d16072b170a4a071607160413800f424016042b0011170a160916071608160a0200000202010e160016012d160016012e0c2f4c020c4a010d2a020000040901404916020c2f4c0216000216011340603b17041602160037170516034c1c160516022d16002f4c0d1604160535170616061604344c051604160016060011021604160416002d16022a0007024a1d160516022d16002f7a4c041816041605331340dd7b160416052b170716041600160700111708160813d1010000000000000000000000000000000000000000311340e17b1608020000040701402116034c11160213c901000000000000000000000000160100101704160016042a1705160513d1010000000000000000000000000000000000000000311340e17b1605024a0e160213c90100000000000000000000000016010011170616001606331340de7b160016062b0200000404011916000c331340df7b16010c331340e07b16034c07160016011602030008024a061600160116020300090200000404011916000c331340df7b16010c331340e07b16034c07160016011602040009024a061600160116020400080200000406011916021340603b1704160116002b170516034c08160416051601001116000007024a07160416051601001016002d0200000303011b16020b274c0f160016011602057c203d04000c3f057c20024a081600160116023d03000c3f02000004050111160116002b170416034c061602160413c9010000000000000000000000000011024a051602160413c90100000000000000000000000000100200000303011b160205264c0f160016011602057c203d04000e3f057c20024a081600160116023d03000e3f020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200101703160016011602870c334c0416030d2a021603020000010101120e16007a7a1241003a7a05294b033a904a023a221302640200000105011b1600001217011601cb17021602c54c02160202b21301640c130164170417031601ce0416031604c11816020200000103010d1600001217011601cb17021602c54c02160202ce040200000103001e1600ce0a23052413412d7b16007a7ace0a3a7a05294b033a904a023a22170116010013170216010d0c160201020000020602403016007a7ace0a3a7a05294b033a904a023a2216014c02054a01061f170216020014170316021601ce0a0f0e1603010317051704160412bff27618264c0212bff276181704160412800d89e8284c0212800d89e817041604160502010003030108d37afb14100d1600160116021304640201000405010ad35b19984c1601160216030017170416001604cc0200000101010316004002000003040109160016020019cc1703160116034402000003040109160016011602001a170316001603cc0200000202000f16001601261340667b160012bff27618291340677b160112800d89e8271340687b0000010101050c160013026402010001020107d30949c5981600001d17011601cb02000001080240301600001d17011601cb17021602c54c03160204021600a002274c04a00ea00fa0104a030c0c0c170517041703b216001302640c05160316041605130564170717061601ce0316061607c11816020302000003040108160016011602001717031603cb020000030d024039160016011602001717031603cb17041604c54c03160404020c0c0c1709170817070c0c0c170c170b170ab2a0001406414c504800031303640c160716081609160a160b160c13076417061705a0000d2aa1001603ce01160516060d1600c9181604030200000209034047a002a00ea00fa010100f16000101170417031702a002a00ea00fa010100f160101021707170617050c170816080f314c402716087a0f314d130e2ac316087a0f314d0e2a782b16087a0f314d112a783616087a0f314d0e2a7916080d2a17084a7fd5160216031604020000051103404b1602001f170617051603001f17081707ce0b1604040f0d160501001709ce0b1604030f0d16070100170a16097a4b021816064c0216020015160a7a4b021816084c0216030015160516070022170d170c170b1604160b160c160d100f160001041710170f170e16094c0516010d0c16050103160a4c0516010d0c16070103160e160f1610020003050f05405416021603001c560030160016011602160316040023170717061705160405254c403ca004170816020004170916030004170aa0021602264c0b1609160a1604000d170b160b0516051606160702a0021603264c16a001160a1604000d170c1609a0011604000f170d16083f16041f3da104160c160d160516061607021609160a1604000f170e05160e1605160616070205051605160616070201070513024056d3e58379f416011602160300211706170516064c0d16040c2f170716071913406b7b160016014513406c7b16011602160316043f170b170a170917081600160516064c020c4a010da3160516081609160a160b00241710170f170e170d170c160c3d1711160d3d17121600ce061611ac1600ce071612ac1207160116021603160e160f161056750916001601160216031604161116125676161116120201030511024048d39d5023b316011602160316043f057c20170817071706170516011602160300201709160016090da3160916051606160716080024170e170d170c170b170a160a057c203d170f160b057c203d1710160f16100e0c160901051207160116021603160c160d160e56750a16001601160216031604160f161075160f1610020103080d03402bd3417830ee160216031604002017081605160616070f1016080106170c170b170a1709160016080da31608160016011609160a160b160c00281206160016011602160316041609160a160b761609160a160b020001070b004039ce06ce07ce081709170817070c170a160a0f314c4022160a7a0f314d0f2a780c334c121602160a7a0f314d13072a78160a7a0f314d0f2a78ab160a0d2a170a4a7fda16064c09160116000dbd16020d0c1600010701000418004097d34c88990ba0011704a0021705a00417061601052817070517081605160019001618170906160900045e16030c334c407c16030d2b1703160516000016170b170a160a0004170c1604160c16061601ce0900061710170f170e170d16074c0d1601160e16102a3f2017011608160f3f2017084a0c1601160f3f1f17011608160e16102a3f1f1708160b4c17160a001e17110c0d16110105171216004c051612057c204a011612171316063f16131f3d170616004c04160a06204a01160a1705160d170407160416065f160105244c1f1602430c2f4c0102160016071c4c02ce074a01ce061714160216141607002b171717161817151615160816171603100c16160129024a7f80010307403402416dd3d6407a21160405251340697b560030160405281707a001a002a003170a1709170816034c0c16051608317a4c0418160513c101000276a33313406a7b4a0b16051608337a4c0418160513d0fffd8963efd1fc6a506488495d951d5263988d263113406a7ba00416034c04160a13102e4a03160a103c170c170b1604051608160916034c02a00e4a01a00f160b0c1713171217111710170f170e170d160d05257a4c0418160f1605304c409b1610160300161715171416140004171616034c0416161605314a031616160533171716174c0216054a0116161718160f16181612160dce090006171c171b171a1719160f161416151616161a161b161c1723172217211720171f171e171d1619170f16074c0d160d162116232a3f20170d160e16223f20170e4a0c160d16223f1f170d160e162116232a3f1f170e160c0c334c041623160c2d4a010c1724161316242a171316120c334c091611162316242b13cd0100000000000000000000000000000000161200102a1711160f16202f4c4027161f4c1c161e001e1725a00ea00fa01016031611110d16250104172616034c051626057c204a011626172716123f16271f3d171216034c04161e06204a01161e17104a07160f161d304c03160f000517104a7f5b160fa1011610a1021612a1041613130a2d1728161316282b171316034c071611a10ea01116132aa1114a061611a10fa01216132aa1121604160d201729160e172a160316071d4c041629172a160e172916034c0e160016011602ce0616293dce07162a057c203d16064a0d160016011602ce07162a3dce061629057c203d1606173217311730172f172e172d172c172b16074c0f1600162e162fa3162b162c162d162e162f1630163116321628002d4a1216001602a51733160016021633a3162b162c162d162e162f1630163116321628002c08160016011629162aa001a004a002751629162a020000030d04404116000c13206217030e170416001320132016042a62170516056d1706160171160371311707160716021c170816084c0413c101000276a30d2a4a0313d0fffd8963efd1fc6a506488495d951d5263988d260d2b17091600132016042a16004362170a16074c0416011603444a031603160144170bce00160b1606001b170c16081609160c160a020001091000404716031602414c1e160016031604acce02160047cc1709ce00ce06ce0744ce05001a170a160016031608a3160016031608160a0c110c160901004a40211607160304002b170e170d170c170b16001602a5170f16001602160fa31600b21602160b16043f057c20160c160e13070e160d012a1818160116051606ab00010910004046160016031604acce02160147cc17091609c51340717b1609170ace00ce06ce0744ce05001a170b160016031608a3160016031608160b0c110c160a010016051602414c05160116051606ab4a1a1607160503002b170f170e170d170cb216051606a3b216011602160c16063f160d160f13070e160e012a1818010002020307d3c62bf5cfa0011600000416010004020000020800408716007a0f314d0f2c112ac3170216007a0f314d0f2c112a0d2ac3170316020c2f7a4b041816011602327a4b041816031602324c0102a0040c304c404f160116022b170416007a0f314d0f2c112a0e2ac31705160316022b170616041606314c0516041605160600104a011605170716007a0f314d130e2ac3160713cd0100000000000000000000000000000000a00400102a16007a0f314d130e2ac416007a0f314d0f2c112a0e2ac316072b16007a0f314d0f2c112a0e2ac4160116007a0f314d0f2c112ac400000102000e0c170116010f314c0816011600002f16010d2a17014a340107030a004096d34ca91e1416010f311340727b16020c331340747bce06ce07ce0817051704170316017a0f314d0f2a7817065617071607003016017a0f314d0f2c112a0e2ac3170816017a0f314d0f2c112a0d2ac31607337a4c041816080c331340737b16017a0f314d0f2c112a0d2ac316072b1709160716017a0f314d0f2c112ac416017a0f314d0f2c112a0d2ac316091602160800102a16017a0f314d0f2c112a0d2ac416017a0f314d0f2c112a0e2ac316022a16017a0f314d0f2c112a0e2ac4160016061602ac0107050a004065d375c252e5b4ce00774513406f7b16010f311340727b16040c331340747b56170516021605334c0216024a011605170616061603311340707b16050030ce06ce07ce08170917081707160616017a0f314d0f2c112ac4160316017a0f314d0f2c112a0d2ac416017a0f314d0f2c112a0e2ac316042a16017a0f314d0f2c112a0e2ac4160016017a0f314d13072a781604ac01020103001cd3960b26b3b3ce00411341937ba0111701a01217021600ce061601ab1600ce071602ab0ca1110ca1121208b41600160116026101000840270840d1d300611b5f1601001e17081602001e17091600160116020020170a0c10160a0108170e170d170c170b16081609002217111710170f160100041712160200041713051714051715160b3f1716a0021601264c06161216131616000d17144a14a0021602264c0ba00116131616000d17141612a0011616000f17154a05161216131616000f17150c0c0c171917181717160b0c334c40290c171a161a0f314c4023161a7a0f314d130f2a78161a7a0f314d130c2a782b171b161b160b13cd01000000000000000000000000000000000010161a7a0f314d13172a79161a0d2a171a4a7fd905171c05171d56171e161e16062b171f1607161f2a17201603160b161f2c2a3f1721a0021601264c06161216131621000d171c4a14a0021602264c0ba00116131621000d171c1612a0011621000f171d4a05161216131621000f171da001a00113c901000000000000000000000000001017221622161c3d13c9010000000000000000000000000010161d3d2a1723160416172a1724160516182a17251622162413c901000000000000000000000000001016252a17261614161516171618161916231626162002010000000103d3ee6a5cd514404868747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f616c65706869756d2f746f6b656e2d6c6973742f6d61737465722f636f72652f6d2e6a736f6e02",
+  codeHash: "96b76b34db56478711f9c3457ae261ae3397dd5288d9366f30dce667977ed288",
   fieldsSig: {
     names: [
       "parent",
@@ -9955,14 +9990,23 @@ var Pool_ral_default = {
     {
       name: "withdraw",
       paramNames: [
+        "position",
+        "operator",
         "recipient",
-        "amounts"
+        "amounts",
+        "toDestroy"
       ],
       paramTypes: [
+        "Position",
         "Address",
-        "[U256;3]"
+        "Address",
+        "[U256;3]",
+        "Bool"
       ],
       paramIsMutable: [
+        false,
+        false,
+        false,
         false,
         false
       ],
@@ -10778,7 +10822,7 @@ var Pool = new Factory16(
   import_web320.Contract.fromJson(
     Pool_ral_default,
     "",
-    "cdb37fb2772ba9c976a4dc34db15994ecaeef82d8690b9a94c600a81c67f98c4",
+    "96b76b34db56478711f9c3457ae261ae3397dd5288d9366f30dce667977ed288",
     AllStructs
   )
 );
@@ -11475,7 +11519,7 @@ var import_web321 = require("@alephium/web3");
 
 // ../clmm/artifacts/PoolConfig.ral.json
 var PoolConfig_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "PoolConfig",
   bytecode: "030112010000000305d3bda4d814ce00ce01ce0202",
   codeHash: "aa0838a7a189126cf0627d909b65ba3cfc692813db3d5ccd950763a87d52a0d6",
@@ -11574,7 +11618,7 @@ var import_web322 = require("@alephium/web3");
 
 // ../clmm/artifacts/PoolFactory.ral.json
 var PoolFactory_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "PoolFactory",
   bytecode: "08090a1f403540a040ed41ce41f5422b424500000101010316004002000003040109160016020000cc17031601160344020000030401091600160116020001170316001603cc020000010401403a12bff276187a7a16003a7a05294b033a224a023a90160021170112800d89e87a7a16003a7a05294b033a904a023a22160021170216021601207a7a16003a7a05294b033a904a023a223d0d2a170313ccffffffffffffffffffffffffffffffff16032d0201000307014028d31c03e050b4ce00451341937b16001601160213036413006417041703a0001705a000000017061606ce0516031604c118a0000d2aa1000516055e07160116001605601605020100054020014079d3530365c2160071160171311342bd7b16020000cb17050c0f1605010017081707170616060003170916030d0dce010105170a1603160a0c170d170c170b0c0c0c0c0c0c0c0c0c171a171917181717171617151714171317120c0c0c171d171c171b0c0c171f171eb1ce02ce06ce03ce0416021600160116041607160616091406414c50480002130d640c160b160c160d0c16121613161416151616161716181619161a161b161c161d161e161f131364170f170eb116001601441602000117101610ce01160e160fc1171106161116001601160261161102010004050012d32d2d48cdb4ce00451342bf7bb1160216034416010002170416000d0c160401330103090a001ad3132dd93db4ce00451342be7bb11601160244160000021709160316041608a316031605160616071608110c1609013201000303000ad3333a48b8b4ce00451341937b160016011602bb",
   codeHash: "4f2990418f84360134e2fe3c2732c0ad191b52d772a8406ae9afe6e87c427bf3",
@@ -12128,7 +12172,7 @@ var import_web323 = require("@alephium/web3");
 
 // ../clmm/artifacts/PoolUser.ral.json
 var PoolUser_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "PoolUser",
   bytecode: "08014198010009140840b7d30719041916000c304c09a000a001a002a003a004a005a006a00702b21301640c130164170a170914010016051609160a13c41bc16d674ec800001601c9a10014010116051609160a13c41bc16d674ec800001601c9a10114010216051609160a13c41bc16d674ec800001601c9a102b21602160316041605160716081307640c130164170c170b1401031606160b160cc1a107060c0c0f0da0070104170d061341f40c0f0da0070104170e06134bb80c0f0da0070104170f061367100c0f0da00701041710a00071a00171334c06a0001711a001a1001611a101a00171a00271334c06a0011712a002a1011612a102a00071a00171334c06a0001713a001a1001613a101cda000160d13c9010000000000000000000000001400110da0070105a103a000a001160e13c9010000000000000000000000001400110da0070105a104a000a002160f13c9010000000000000000000000001400110da0070105a105a001a002161013c9010000000000000000000000001400110da0070105a106a000a001a002a003a004a005a006a00702",
   codeHash: "9e1114eb366a5aaf1730e3b16068a672c09da46c4e5111267129c5a0bceeaa97",
@@ -12285,10 +12329,10 @@ var import_web324 = require("@alephium/web3");
 
 // ../clmm/artifacts/Position.ral.json
 var Position_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "Position",
-  bytecode: "0a0819402c410e413141d741f84276428a01000001010ece007a494d470d13216217000c0d160001350201000000020ace007a494d470d132162ce01020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200021703160016011602870c334c0416030d2a0216030201000409034062d379a1c203b4ce00451343857ba0003f16001f3d17040c0c0c1707170617050c170816080f314c403ea0000c334c403516087a0f314d0d2a7816087a0f314d0d2ac32ba00013cd0100000000000000000000000000000000000216087a0f314d112a7916087a0f314d102ac316087a0f314d112a782a16087a0f314d102ac416080d2a17084a7fbe160116021603a103a102a1011604a1001605160616070201000202000ed3b478489ab4ce00451343857ba00416002aa104a00516012aa10501000308034056d3ad05a194b4ce00451343857b0c0c0c1705170417030c170616060f314c404016067a0f314d7816067a0f314d102ac3334c0916067a0f314d102ac34a0616067a0f314d781707160716067a0f314d0f2a7916067a0f314d102ac316072b16067a0f314d102ac416060d2a17064a7fbc16031604160502010000000406d3f97c255fa000a001a002a00302",
-  codeHash: "893257ca0a6b91cb3976f1cdb74a6b56f8a9f0d54a8034e22e8281dd33c6f313",
+  bytecode: "0a0919402c410e413141d741f8429142a742bb01000001010ece007a494d470d13216217000c0d160001350201000000020ace007a494d470d132162ce01020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200021703160016011602870c334c0416030d2a0216030201000409034062d379a1c203b4ce00451343857ba0003f16001f3d17040c0c0c1707170617050c170816080f314c403ea0000c334c403516087a0f314d0d2a7816087a0f314d0d2ac32ba00013cd0100000000000000000000000000000000000216087a0f314d112a7916087a0f314d102ac316087a0f314d112a782a16087a0f314d102ac416080d2a17084a7fbe160116021603a103a102a1011604a1001605160616070201000202000ed3b478489ab4ce00451343857ba00416002aa104a00516012aa1050100030904406ad38bd64d8cb4ce00451343857b0c0c0c170517041703a0000c2f17060c170716070f314c404f16077a0f314d7816077a0f314d102ac3334c0916077a0f314d102ac34a0616077a0f314d781708160816077a0f314d0f2a7916077a0f314d102ac316082b16077a0f314d102ac416067a4c0b1816077a0f314d102ac30c2f170616070d2a17074a7fad160316041605160602010201010008d320f98f62b4ce00451343857b1600b0010000000406d3f97c255fa000a001a002a00302",
+  codeHash: "3546ca8d69d4cddb00cc441b914f473b131224dc9d97b4db3e50cce863418a4c",
   fieldsSig: {
     names: [
       "parent",
@@ -12424,9 +12468,23 @@ var Position_ral_default = {
         false
       ],
       returnTypes: [
-        "[U256;3]"
+        "[U256;3]",
+        "Bool"
       ]
     },
+    {
+      name: "destroy",
+      paramNames: [
+        "recipient"
+      ],
+      paramTypes: [
+        "Address"
+      ],
+      paramIsMutable: [
+        false
+      ],
+      returnTypes: []
+    },
     {
       name: "getState",
       paramNames: [],
@@ -12516,6 +12574,9 @@ var Factory20 = class extends import_web324.ContractFactory {
     collect: async (params) => {
       return (0, import_web324.testMethod)(this, "collect", params, getContractByCodeHash2);
     },
+    destroy: async (params) => {
+      return (0, import_web324.testMethod)(this, "destroy", params, getContractByCodeHash2);
+    },
     getState: async (params) => {
       return (0, import_web324.testMethod)(this, "getState", params, getContractByCodeHash2);
     }
@@ -12528,7 +12589,7 @@ var Position = new Factory20(
   import_web324.Contract.fromJson(
     Position_ral_default,
     "",
-    "893257ca0a6b91cb3976f1cdb74a6b56f8a9f0d54a8034e22e8281dd33c6f313",
+    "3546ca8d69d4cddb00cc441b914f473b131224dc9d97b4db3e50cce863418a4c",
     AllStructs
   )
 );
@@ -12604,6 +12665,15 @@ var PositionInstance = class extends import_web324.ContractInstance {
         getContractByCodeHash2
       );
     },
+    destroy: async (params) => {
+      return (0, import_web324.callMethod)(
+        Position,
+        this,
+        "destroy",
+        params,
+        getContractByCodeHash2
+      );
+    },
     getState: async (params) => {
       return (0, import_web324.callMethod)(
         Position,
@@ -12636,6 +12706,9 @@ var PositionInstance = class extends import_web324.ContractInstance {
     collect: async (params) => {
       return (0, import_web324.signExecuteMethod)(Position, this, "collect", params);
     },
+    destroy: async (params) => {
+      return (0, import_web324.signExecuteMethod)(Position, this, "destroy", params);
+    },
     getState: async (params) => {
       return (0, import_web324.signExecuteMethod)(Position, this, "getState", params);
     }
@@ -12655,7 +12728,7 @@ var import_web325 = require("@alephium/web3");
 
 // ../clmm/artifacts/PositionManager.ral.json
 var PositionManager_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "PositionManager",
   bytecode: "0110409a40c840ec413e416c424e4271427b429042a642bc42d7431a438e43ec444d01030b16044051d39b20ce13ce00160116024416030009170b160516060e0f160b012e170e170d170c160c160d160e160716080003170f160b160416051606000b171016001610a5171116001601a5171216001602a5171316007a7a16011612a316021613a316101611a31600160416051606160f110e160b01251715171416141609347a4c04181615160a341343527b160f16141615160b0201000304010dd3b8a5f4fb1600160113c9010000000000000000000000000005170316021603160116002b000502010003030108d364be47fc160213c901000000000000000000000000160116002b00050201000507014027d345f12d7a16001601324c061601160216030001024a1c16001602314c13160016021603000117051601160016040002170616051606314c0216054a011606024a0516011602160400020201000304010ed374e08b3b160213c9010000000000000000000000002c160116002b160100051703160316002d020000030901408d160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816041608370200000304011216001601160200051703160016011602870c334c0416030d2a0216030200000101010316004002000003040109160016020007cc17031601160344020000030401091600160116020008170316001603cc02010003030108d37afb14100d1600160116021304640201000405010ad35b19984c160116021603000a170416001604cc0201030b0d004021d3259c1e8816001601a5170b16001602a5170c16007a1601160ba31602160ca31600160116021603160416051606160716081609160a00001818181801030a0e004041d35060929cce00160216034416040009170a160a160516061607000b170b1600160b0da316001605160616071601110e160a0126170d170c160c1608347a4c0418160d1609341343537b1600160b0da3160016051605160616070c0d360c0d360c0d3613080f160a012718181801030b0d004032d3ee4d9e3ace00160216034416040009170b160b160516071608000b170c1600160c0da316001605160716081601110e160b012618181600160c0da3160016061605160716081609160a0c0d3613080f160b012718181801000409044034d341eff2fd1600160116021603000b17040c17051604c54b041605d12a170516020d0d1600011ec54b041605d12a170516030d0d1600011ec54b041605d12a1705160216030e0f1600012e170817071706160616071608160502",
   codeHash: "ab39514b7b087164d46e689fc18e1793c9aa0c677ece80b18439df6526c09698",
@@ -13466,7 +13539,7 @@ var import_web326 = require("@alephium/web3");
 
 // ../clmm/artifacts/TestToken.ral.json
 var TestToken_ral_default2 = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "TestToken",
   bytecode: "040409121b4025010000000102ce0002010000000102ce0102010000000102ce02020100000001040c0d3602",
   codeHash: "32d99ee24650d37c7111a9cc02ed2694b608e2d1b52301d27c6b28abc9ba94e9",
@@ -13647,7 +13720,7 @@ var import_web327 = require("@alephium/web3");
 
 // ../clmm/artifacts/Tick.ral.json
 var Tick_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "Tick",
   bytecode: "0706405140a340f5410b416541730100030601402ad344ba8eddb4ce00451343217ba000170316033f16011f1704160405291343237b16043d170516051600321343227b1605a10016024c04a0011601204a03a00116011fa10116050c2f0201000405034032d3cfc5e9a41600ce01294c05a002a003a004024a40280c170416040f314c1e16047a0f314d0d2a7816047a0f314d0e2ac32b16047a0f314d0d2a7916040d2a17044a7fde1601160216030201000405034032d36efb0f181600ce01264c05a002a003a004024a40280c170416040f314c1e16047a0f314d0d2a7816047a0f314d0e2ac32b16047a0f314d0d2a7916040d2a17044a7fde16011602160302010201010008d3b0cd421fb4ce00451343217b1600b001000506014035d336cb1526b4ce00451343217b16034c03160417004a02160417010c170516050f314c1a16057a0f314d7816057a0f314d0e2ac32b16057a0f314d7916050d2a17054a22160016011602a104a103a102a00102010000000103d3602bc55da00102",
   codeHash: "1373551ca890d886980b8d33277d7ed7a2c9f7665d77a1e893a1f2554d10d4b1",
@@ -13935,7 +14008,7 @@ var import_web328 = require("@alephium/web3");
 
 // ../clmm/artifacts/TickBitmapTest.ral.json
 var TickBitmapTest_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "TickBitmapTest",
   bytecode: "02091e4050406c409f410041164131415941680000010101120e16007a7a1241003a7a05294b033a904a023a221302640200000105011b1600000017011601cb17021602c54c02160202b21301640c130164170417031601ce0016031604c11816020200000103010d1600000017011601cb17021602c54c02160202ce000200000103001e1600ce0123052413412d7b16007a7ace013a7a05294b033a904a023a22170116010001170216010d0c160201020000020602403016007a7ace013a7a05294b033a904a023a2216014c02054a01061f170216020002170316021601ce010f0e1603010317051704160412bff27618264c0212bff276181704160412800d89e8284c0212800d89e817041604160502010003030108d37afb14100d1600160116021304640201000405010ad35b19984c1601160216030005170416001604cc02010303060113d3b7624ae716011602130264130064170417031600d1a2b116031604af1705160502010001010003d3a2f62a8d16000003",
   codeHash: "5cb6cce5c5b8adb88a18a993227d51465e3e54b5a34936cafc51100725724b54",
@@ -14388,7 +14461,7 @@ var import_web329 = require("@alephium/web3");
 
 // ../clmm/artifacts/CreateConfig.ral.json
 var CreateConfig_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "CreateConfig",
   bytecodeTemplate: "01010300010011{0}{4}40cc17001600c5194c08{1}{2}{3}0f0d{0}010418",
   fieldsSig: {
@@ -14427,7 +14500,7 @@ var CreateConfig_ral_default = {
 
 // ../clmm/artifacts/CreateLiquidPool.ral.json
 var CreateLiquidPool_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "CreateLiquidPool",
   bytecodeTemplate: "0101030002001fb41700{1}{2}{3}{4}{5}110d{0}0105170116007a{1}{9}a3{2}{10}a316001600{6}{7}{8}110e160101251818",
   fieldsSig: {
@@ -14484,9 +14557,9 @@ var CreateLiquidPool_ral_default = {
 
 // ../clmm/artifacts/PoolRouterDemo.ral.json
 var PoolRouterDemo_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "PoolRouterDemo",
-  bytecodeTemplate: "010103004026004270b41700{8}1600{0}{1}{2}{3}{4}{6}{7}13091308{5}010017081707170617051704170317021701{8}0c2f4c405016000d0c{7}010116007a13c40de0b6b3a7640000a2160113c40de0b6b3a7640000a3160016000b0613800f4240110e16040125181816007a160113c40de0b6b3a7640000a3160213c40de0b6b3a7640000a3160016000b0613800f4240110e16050125181816007a160113c40de0b6b3a7640000a3160313c40de0b6b3a7640000a3160016000b0613800f4240110e16060125181816007a160213c40de0b6b3a7640000a3160313c40de0b6b3a7640000a3160016000b0613800f4240110e1607012518180c6717090d67170a0e67170b0f67170c{8}0d2f4c403ecd16010d13c9010000000000000000000000001400110d16080105170d16007a13c40de0b6b3a7640000a2160113c40de0b6b3a7640000a3160016000b0613800f4240110e160d012518181400170e16001602a5170f1600160113c40de0b6b3a7640000a316001600160203120a13c101000276a30d2a160e13070e1605012a181816001602a5160f2b0c331343e97b{8}0e2f4c40241603160c44171016001603a517111600160113c40de0b6b3a7640000a316001600160303120a13c101000276a30d2a161013070e1605012a181816001603a516112b0c331343ea7b{8}0f2f4c40241601160b44171216001601a517131600160213c40de0b6b3a7640000a316001600160103120a13c101000276a30d2a161213070e1607012a181816001601a516132b0c331343eb7b{8}102f4c40241602160a44171416001602a517151600160313c40de0b6b3a7640000a316001600160204120a13d0fffd8963efd1fc6a506488495d951d5263988d260d2b161413070e1606012a181816001602a516152b0c331343ec7b{8}112f4c40221400171616001601a517171600160213c40de0b6b3a7640000a316001600160104120a13d0fffd8963efd1fc6a506488495d951d5263988d260d2b161613070e1605012a181816001601a516172b0c331343ed7b{8}13062f4c40221400171816001602a517191600160113c40de0b6b3a7640000a316001600160103123613c101000276a30d2a161813070e1605012a181816001602a516192b130a2f1343ee7b{8}13072f4c40241601160a44171a16001603a5171b1600160113c40de0b6b3a7640000a316001600160103123613c101000276a30d2a161a13070e1607012a181816001603a5161b2b130a2f1343f07b{8}13082f4c40241601160b44171c16001602a5171d1600160113c40de0b6b3a7640000a316001600160104123613d0fffd8963efd1fc6a506488495d951d5263988d260d2b161c13070e1607012a181816001602a5161d2b130a2f1343f07b{8}13092f4c40241602160a44171e16001603a5171f1600160213c40de0b6b3a7640000a316001600160203123613c101000276a30d2a161e13070e1606012a181816001603a5161f2b130a2f1343f07b{8}130a2f4c40221400172016001601a517211600160213c40de0b6b3a7640000a316001600160204123613d0fffd8963efd1fc6a506488495d951d5263988d260d2b162013070e1605012a181816001601a516212b130a2f1343ee7b{8}130b2f4c40271601160b44cd44160944172216001602a51723160013c40de0b6b3a7640000a216001600cd04123613d0fffd8963efd1fc6a506488495d951d5263988d260d2b162213070e1607012a181816001602a516232b130a2f1343f07b{8}130c2f4c40261601160b44cd4416094417241600a417251600160213c40de0b6b3a7640000a316001600cd03120a13c101000276a30d2a162413070e1607012a18181600a416252b0c331343eb7b",
+  bytecodeTemplate: "01010300405600431cb41700{8}1600{0}{1}{2}{3}{4}{6}{7}13091308{5}010017081707170617051704170317021701{8}0c2f4c405016000d0c{7}010116007a13c40de0b6b3a7640000a2160113c40de0b6b3a7640000a3160016000b0613800f4240110e16040125181816007a160113c40de0b6b3a7640000a3160213c40de0b6b3a7640000a3160016000b0613800f4240110e16050125181816007a160113c40de0b6b3a7640000a3160313c40de0b6b3a7640000a3160016000b0613800f4240110e16060125181816007a160213c40de0b6b3a7640000a3160313c40de0b6b3a7640000a3160016000b0613800f4240110e1607012518180c6717090d67170a0e67170b0f67170c{8}0d2f4c4050cd16010d13c9010000000000000000000000001400110d16080105170d16007a13c40de0b6b3a7640000a2160113c40de0b6b3a7640000a3160016000b0613800f4240110e160d012518181400170e120a170f16001602a517101600160113c40de0b6b3a7640000a316001600160203160f13c101000276a30d2a160e13070e1605012a1712171116001602a516102b171316130c331343e97b1611160f241347d17b161216133f057c2024134bb97b{8}0e2f4c40321603160c441714120a171516001603a517161600160113c40de0b6b3a7640000a316001600160303161513c101000276a30d2a161413070e1605012a1718171716001603a516162b171916190c331343ea7b16171615241347d27b16180526134bba7b{8}0f2f4c40321601160b44171a120a171b16001601a5171c1600160213c40de0b6b3a7640000a316001600160103161b13c101000276a30d2a161a13070e1607012a171e171d16001601a5161c2b171f161f0c331343eb7b161d161b241347d37b161e0526134bbb7b{8}102f4c40321602160a441720120a172116001602a517221600160313c40de0b6b3a7640000a316001600160204162113d0fffd8963efd1fc6a506488495d951d5263988d260d2b162013070e1606012a1724172316001602a516222b172516250c331343ec7b16241621241347d47b16230526134bbc7b{8}112f4c403014001726120a172716001601a517281600160213c40de0b6b3a7640000a316001600160104162713d0fffd8963efd1fc6a506488495d951d5263988d260d2b162613070e1605012a172a172916001601a516282b172b162b0c331343ed7b162a1627241347d57b16290526134bbd7b{8}13062f4c40301400172c1236172d16001602a5172e1600160113c40de0b6b3a7640000a316001600160103162d13c101000276a30d2a162c13070e1605012a1730172f16001602a5162e2b17311631130a2f1343ee7b1630162d241347d67b162f0528134bbe7b{8}13072f4c40321601160a4417321236173316001603a517341600160113c40de0b6b3a7640000a316001600160103163313c101000276a30d2a163213070e1607012a1736173516001603a516342b17371637130a2f1343f07b16361633241347d77b16350528134bbf7b{8}13082f4c40321601160b4417381236173916001602a5173a1600160113c40de0b6b3a7640000a316001600160104163913d0fffd8963efd1fc6a506488495d951d5263988d260d2b163813070e1607012a173c173b16001602a5163a2b173d163d130a2f1343f07b163b1639241347d87b163c0528134bc07b{8}13092f4c40321602160a44173e1236173f16001603a517401600160213c40de0b6b3a7640000a316001600160203163f13c101000276a30d2a163e13070e1606012a1742174116001603a516402b17431643130a2f1343f07b1642163f241347d97b16410528134bc17b{8}130a2f4c4030140017441236174516001601a517461600160213c40de0b6b3a7640000a316001600160204164513d0fffd8963efd1fc6a506488495d951d5263988d260d2b164413070e1605012a1748174716001601a516462b17491649130a2f1343ee7b16471645241347da7b16480528134bc27b{8}130b2f4c40351601160b44cd44160944174a1236174b16001602a5174c160013c40de0b6b3a7640000a216001600cd04164b13d0fffd8963efd1fc6a506488495d951d5263988d260d2b164a13070e1607012a174e174d16001602a5164c2b174f164f130a2f1343f07b164d164b241347db7b164e0528134bc37b{8}130c2f4c40341601160b44cd441609441750120a17511600a417521600160213c40de0b6b3a7640000a316001600cd03165113c101000276a30d2a165013070e1607012a175417531600a416522b175516550c331343eb7b16531651241347dc7b16540526134bc47b",
   fieldsSig: {
     names: [
       "pool_",
@@ -14535,9 +14608,9 @@ var PoolRouterDemo_ral_default = {
 
 // ../clmm/artifacts/SwapWithoutAccount.ral.json
 var SwapWithoutAccount_ral_default = {
-  version: "v4.3.0",
+  version: "v4.4.1",
   name: "SwapWithoutAccount",
-  bytecodeTemplate: "010103000400402cb41700{0}160047cc17011601c5194c0516000d0c{0}d465b302f9{5}3d1702{5}05264c02{2}4a01{3}17031600{2}1602a3160016001603{4}{5}{6}{7}13070e{1}012a1818",
+  bytecodeTemplate: "010103000700404db41700{0}160047cc17011601c5194c0516000d0c{0}d465b302f9{5}05264c041600{2}a54a02{5}3d1702{5}05264c02{2}4a01{3}17031600{2}1602a3160016001603{4}{5}{6}{7}13070e{1}012a17051704{4}{5}05281c17061606197a4b04181604{5}241341f57b16067a4b04181605{5}241341f57b",
   fieldsSig: {
     names: [
       "dexAccount",
@@ -15579,29 +15652,29 @@ var TickUtils = class {
     const tick = rawTick / tickSpacing * tickSpacing;
     return this.getPriceFromTick(tick, tokenBase, tokenQuote, baseIn);
   }
-  static getNextSqrtPrice(sqrtPriceX96, liquidity, amount, zeroForOne) {
-    if (zeroForOne) {
-      return this.getNextSqrtPriceFromAmount0(sqrtPriceX96, liquidity, amount);
-    } else {
-      return this.getNextSqrtPriceFromAmount1(sqrtPriceX96, liquidity, amount);
-    }
-  }
   static getNextSqrtPriceFromAmount0(sqrtPriceX96, liquidity, amount) {
     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(sqrtPriceX96, liquidity, amount) {
     const quotient = MathUtil.alphDiv(amount * Q96, liquidity);
     return sqrtPriceX96 + quotient;
   }
+  static getNextSqrtPrice(sqrtPX96, liquidity, amount, zeroForOne) {
+    if (zeroForOne) {
+      return this.getNextSqrtPriceFromAmount0(sqrtPX96, liquidity, amount);
+    } else {
+      return this.getNextSqrtPriceFromAmount1(sqrtPX96, liquidity, amount);
+    }
+  }
   static getSqrtPriceLimitX96(sqrtPriceX96, slippage, zeroForOne) {
-    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);
     let limit = zeroForOne ? minBound : maxBound;
@@ -15624,21 +15697,9 @@ var TickUtils = class {
     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];
   }
   static priceSqrt(r1, r0) {
@@ -15741,7 +15802,7 @@ var ClmmLiquidityUtils = class {
     if (zeroForOne) {
       return this.getToken0Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity);
     } else {
-      return this.getToken1Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity);
+      return this.getToken1Delta(sqrtRatioBX96, sqrtRatioAX96, liquidity);
     }
   }
   static getToken0Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity) {
@@ -15823,16 +15884,16 @@ var PoolUtils = class {
     return (0, import_web330.subContractId)(poolId, (0, import_web330.binToHex)(path), group);
   }
   static computeSwapStep(sqrtPriceX96, sqrtPriceTargetX96, liquidity, amount, feePips) {
-    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
       );
@@ -15852,44 +15913,40 @@ var PoolUtils = class {
         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
+        -liquidity
       );
-      const amountOut2 = ClmmLiquidityUtils.getAmountDelta(
+      const amountOut2 = ClmmLiquidityUtils.getToken1Delta(
         sqrtPriceNextX96,
         sqrtPriceX96,
-        liquidity,
-        zeroForOne
+        liquidity
       );
       amountIn = max && exactIn ? amountIn : amountIn2;
       amountOut = max && !exactIn ? amountOut : amountOut2;
     } else {
-      const amountIn2 = -ClmmLiquidityUtils.getAmountDelta(
+      const amountIn2 = -ClmmLiquidityUtils.getToken1Delta(
         sqrtPriceX96,
         sqrtPriceNextX96,
-        -liquidity,
-        zeroForOne
+        -liquidity
       );
-      const amountOut2 = ClmmLiquidityUtils.getAmountDelta(
+      const amountOut2 = ClmmLiquidityUtils.getToken0Delta(
         sqrtPriceX96,
         sqrtPriceNextX96,
-        liquidity,
-        zeroForOne
+        liquidity
       );
       amountIn = max && exactIn ? amountIn : amountIn2;
       amountOut = max && !exactIn ? amountOut : amountOut2;
@@ -15898,18 +15955,19 @@ var PoolUtils = class {
     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, amountSpecified, sqrtPriceX96) {
     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
       );
@@ -15921,6 +15979,7 @@ var PoolUtils = class {
         amountCalculated += amountIn + feeAmount;
       }
       sqrtPriceX96 = sqrtPriceNextX96;
+      liquidity = row.liquidity;
     }
     return amountCalculated;
   }
@@ -16120,6 +16179,10 @@ var ClmmModule = class extends ModuleBase {
     return { poolAddress, result };
   }
   async addLiquidity(p) {
+    const [positionId, positionManager, params] = await this.getAddLiquidityParams(p);
+    return await this.addLiquidityFromParams(positionId, positionManager, params);
+  }
+  async getAddLiquidityParams(p) {
     const poolAddress = this.getPoolAddress(p.token0, p.token1, p.configIndex);
     const pool = Pool.at(poolAddress);
     const positionManagerAddress = (0, import_web331.addressFromContractId)(this.config.positionManagerId);
@@ -16139,45 +16202,43 @@ var ClmmModule = class 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 liquidity = ClmmLiquidityUtils.getLiquidityFromAmounts(
-      sqrtPriceX96,
+    const minSqrtPriceX96 = TickUtils.getSqrtPriceLimitX96(sqrtPriceX96, p.slippage, true);
+    const maxSqrtPriceX96 = TickUtils.getSqrtPriceLimitX96(sqrtPriceX96, p.slippage, false);
+    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 = [
-      { 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,
@@ -16188,15 +16249,21 @@ var ClmmModule = class 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, positionManager, params) {
+    const result = await positionManager.transact.addLiquidity(params);
     return { positionId, result };
   }
   async removeLiquidity(p) {
@@ -16339,7 +16406,7 @@ var ClmmModule = class extends ModuleBase {
         sqrtPriceLimitX96,
         data: ""
       },
-      tokens: [{ id: tokenIn, amount: p.amount }],
+      tokens: [{ id: tokenIn, amount: p.amountIn }],
       attoAlphAmount: import_web331.DUST_AMOUNT * 2n
     });
   }
@@ -16395,6 +16462,10 @@ var ClmmModule = class extends ModuleBase {
     });
     return result;
   }
+  getAddLiquidityAttoAlphAmount(token0Id, token1Id) {
+    const nonAlphTokenCount = [token0Id, token1Id].filter((tokenId) => tokenId !== import_web331.ALPH_TOKEN_ID).length;
+    return BigInt(nonAlphTokenCount) * import_web331.DUST_AMOUNT;
+  }
   _getClmmConfig() {
     const networkId = this.scope.network.id;
     try {
@@ -16539,7 +16610,6 @@ var import_web347 = require("@alephium/web3");
 // ../staking/artifacts/ts/index.ts
 var ts_exports3 = {};
 __export(ts_exports3, {
-  AlphStakeAndLock: () => AlphStakeAndLock,
   AlphUnstakeVault: () => AlphUnstakeVault,
   AlphUnstakeVaultInstance: () => AlphUnstakeVaultInstance,
   FullMathTest: () => FullMathTest2,
@@ -16569,10 +16639,10 @@ var import_web333 = require("@alephium/web3");
 
 // ../staking/artifacts/AlphUnstakeVault.ral.json
 var AlphUnstakeVault_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "AlphUnstakeVault",
-  bytecode: "060540ea40f841384172418c0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020001000bd38e18691cb417001600ce00774513147bce01b0",
-  codeHash: "5216c458f360d0f51f5e2109a760814ff97eab76f546adc835eb318c6cbc5256",
+  bytecode: "060640ea40f84138417241ac41c60000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020004021ed34a517d1bb417001600ce00774513147b00021701ce02a0002b1702160216012b170316030c334c04ce00771603a8160116030201020001000bd38e18691cb417001600ce00774513147bce01b0",
+  codeHash: "a065f4a88edfe06c09d65e3c11154fe9d5a5b1cdc42b36adf1a3485ff8a51394",
   fieldsSig: {
     names: [
       "xalphToken",
@@ -16655,6 +16725,16 @@ var AlphUnstakeVault_ral_default = {
         "Bool"
       ]
     },
+    {
+      name: "cancelAndReturn",
+      paramNames: [],
+      paramTypes: [],
+      paramIsMutable: [],
+      returnTypes: [
+        "U256",
+        "U256"
+      ]
+    },
     {
       name: "destroy",
       paramNames: [],
@@ -16839,6 +16919,9 @@ var Factory25 = class extends import_web333.ContractFactory {
     claim: async (params) => {
       return (0, import_web333.testMethod)(this, "claim", params, getContractByCodeHash3);
     },
+    cancelAndReturn: async (params) => {
+      return (0, import_web333.testMethod)(this, "cancelAndReturn", params, getContractByCodeHash3);
+    },
     destroy: async (params) => {
       return (0, import_web333.testMethod)(this, "destroy", params, getContractByCodeHash3);
     }
@@ -16851,7 +16934,7 @@ var AlphUnstakeVault = new Factory25(
   import_web333.Contract.fromJson(
     AlphUnstakeVault_ral_default,
     "",
-    "5216c458f360d0f51f5e2109a760814ff97eab76f546adc835eb318c6cbc5256",
+    "a065f4a88edfe06c09d65e3c11154fe9d5a5b1cdc42b36adf1a3485ff8a51394",
     AllStructs2
   )
 );
@@ -16900,6 +16983,15 @@ var AlphUnstakeVaultInstance = class extends import_web333.ContractInstance {
         getContractByCodeHash3
       );
     },
+    cancelAndReturn: async (params) => {
+      return (0, import_web333.callMethod)(
+        AlphUnstakeVault,
+        this,
+        "cancelAndReturn",
+        params === void 0 ? {} : params,
+        getContractByCodeHash3
+      );
+    },
     destroy: async (params) => {
       return (0, import_web333.callMethod)(
         AlphUnstakeVault,
@@ -16933,6 +17025,14 @@ var AlphUnstakeVaultInstance = class extends import_web333.ContractInstance {
     claim: async (params) => {
       return (0, import_web333.signExecuteMethod)(AlphUnstakeVault, this, "claim", params);
     },
+    cancelAndReturn: async (params) => {
+      return (0, import_web333.signExecuteMethod)(
+        AlphUnstakeVault,
+        this,
+        "cancelAndReturn",
+        params
+      );
+    },
     destroy: async (params) => {
       return (0, import_web333.signExecuteMethod)(AlphUnstakeVault, this, "destroy", params);
     }
@@ -16952,7 +17052,7 @@ var import_web334 = require("@alephium/web3");
 
 // ../staking/artifacts/utils/FullMathTest.ral.json
 var FullMathTest_ral_default2 = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "FullMathTest",
   bytecode: "000140ea0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702",
   codeHash: "fd74df789eb5974e11dfa74960ba1323e0530fe5e1fe0aa43a6c3c9bf9ee1d98",
@@ -17076,7 +17176,7 @@ var import_web335 = require("@alephium/web3");
 
 // ../staking/artifacts/examples/GovernanceDemo.ral.json
 var GovernanceDemo_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "GovernanceDemo",
   bytecode: "090c40c9419741f54217422b426c42a642b44382438d439843a801000206004058d3926b380bb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc54c403f0c0d0d140a5f5f6d61705f5f305f5f16004744cb1705160501010d0d0d1605010117041703000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012a0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012aa100160416012a0d0e0c140a5f5f6d61705f5f305f5f16004744cb01024a09ca140a5f5f6d61705f5f305f5f16004744b10c1601d201020100020700405ed365b06caeb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1706160601010d0d0d1606010117041703160416012b170516050d0e0c140a5f5f6d61705f5f305f5f16004744cb0102000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012b0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012ba10016050c2f4c09ca0d0c140a5f5f6d61705f5f305f5f16004744cb010301000002004033d3ecf99ab7b4ce054513077b000919107b000a19117b56a101ce01ce02ce03ce041017000c170116011600314c14ca140a5f5f6d61705f5f315f5f16017a10314d0d2acf4044b10cd2010116010d2a17014a2805a0015e010000000012d33919f580b4ce054513077b00090f7b000a19117b56a10207a0025e010000000406d3068539face01ce02ce03ce040201000102021ad344a25325140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010116d32e30a67700090f7b140a5f5f6d61705f5f315f5f16004044cbc50e7b0c0d0d140a5f5f6d61705f5f315f5f16004044cb010102010000000103d33cfd4f9ea000020100010300405cd376a80ea2b417011601480c7b00090f7b000a19117b140a5f5f6d61705f5f315f5f16004044cbc50e7b140a5f5f6d61705f5f305f5f16014744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb01010c2f13067b0d0d0d140a5f5f6d61705f5f305f5f16014744cb01011702a00016022aa1000c0d0d140a5f5f6d61705f5f315f5f16004044cb010116022a0c0e0c140a5f5f6d61705f5f315f5f16004044cb010216000c0e0c140a5f5f6d61705f5f305f5f16014744cb01020616011600160260000000000104a0010c3002000000000104a0020c300200000000010700097a4c0318000a1902",
   codeHash: "1d77f89642f8b3bd6364388e7b9b8ad9d58815365d4e7a02a932fe65ab913078",
@@ -17686,7 +17786,7 @@ var import_web337 = require("@alephium/web3");
 
 // ../staking/artifacts/examples/RewardSharingVault.ral.json
 var RewardSharingVault_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "RewardSharingVault",
   bytecode: "040740b74152423c4277428942c0431e01000208004054d3926b380bb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc54c40270c0d0d140a5f5f6d61705f5f305f5f16004744cb01011703160116032a16000d0ece00010d1707170616062f132b7b16000005160316012a0c0e0c140a5f5f6d61705f5f305f5f16004744cb01024a15160116000d0ece00010d1705170416042f132b7bca140a5f5f6d61705f5f305f5f16004744b11601a001d20102a00016012aa10005160016015f01000205004046d365b06caeb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb010117031601160332132c7b160316012b17041600000516040c2f4c0aca0d0c140a5f5f6d61705f5f305f5f16004744cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16004744cb0102a00016012ba10006160016015f0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010101030019d3fe1110a1a0000c33132a7bb417011601ce011600ac160013c40de0b6b3a7640000a00000021702a00116022aa10107160116005f010300010005d3a28b71d5b417001600000500020102001916000006170116010c334c081600ce011601ab08160016015fa0010d0e0c140a5f5f6d61705f5f305f5f16004744cb010201000105014024d31191a066140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1704160401010d0d0d1604010117021701a00116022b17031601160313c40de0b6b3a7640000000202",
   codeHash: "8beaa8b570543344d4352cf8534bbc7df4591b4ecda97cfc3c30bc28dca5adb9",
@@ -18199,7 +18299,7 @@ var import_web339 = require("@alephium/web3");
 
 // ../staking/artifacts/utils/TestDynamicArrayByteVec32.ral.json
 var TestDynamicArrayByteVec32_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "TestDynamicArrayByteVec32",
   bytecode: "00074028407340af40cc40fc411a4128010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002",
   codeHash: "594861ab1850f3d1872ee687c87ddfeca8746bfe5b9ade07fabc4ca27c56661c",
@@ -18546,7 +18646,7 @@ var import_web340 = require("@alephium/web3");
 
 // ../staking/artifacts/utils/TestDynamicSortedArrayForU256.ral.json
 var TestDynamicSortedArrayForU256_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "TestDynamicSortedArrayForU256",
   bytecode: "0008402d4056408840a640f341234141414f010002040115d3cee93194160116000006311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000402010002030119d32cabd28216004313202e0c2f1342267b160016010001170216020b244c031600024a05160016023d00050201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400001705160516012f4c0316043f0216051601314c091600160116040d2a16030004024a061600160116021604000402010002030118d34b2e25b7160116000006311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002",
   codeHash: "86f2584a16af632c63b6c1ead625d4d53f11b9a3f2d465010085bd740be281d3",
@@ -18957,7 +19057,7 @@ var import_web341 = require("@alephium/web3");
 
 // ../staking/artifacts/utils/TestMerkleProof.ral.json
 var TestMerkleProof_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "TestMerkleProof",
   bytecode: "01050e4027407b409b40a5010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a6217051605160200031702160413202a17044a2c160271a000712f02000002020110160071160171314c05160016014400044a04160116004400040200000101010316004f02",
   codeHash: "a6d0eadb4c4fbe25c0155c0a2e31ba6cc7a993cd27b3f708c6af418af44a7c57",
@@ -19239,7 +19339,7 @@ var import_web342 = require("@alephium/web3");
 
 // ../staking/artifacts/XAlphStakeVault.ral.json
 var XAlphStakeVault_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "XAlphStakeVault",
   bytecode: "05174028407340af40cc40fc411a41284136414f41a341c341cd41db42234241431043f0448b451145604577458e45a7010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a62170516051602000a1702160413202a17044a2c160271a000712f02000002020110160071160171314c051600160144000b4a041601160044000b0200000101010316004f02010000000103d3b299f80ace000201000102021ed3f87904e4140a5f5f6d61705f5f305f5f16004744cbc5194c040c0006024a110c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010108d32b875d11140a5f5f6d61705f5f305f5f16004744cbc5020101010800405fd3d63c543cb4170116014813412d7b16000c331341307b1601ce001600ac140a5f5f6d61705f5f305f5f16014744cbc54c40370c0d0d140a5f5f6d61705f5f305f5f16014744cb1707160701010d0d0d1607010117031702160216002a0c0e0c140a5f5f6d61705f5f305f5f16014744cb01021603000517040c170516051604314c0f1603160500001706160116000e0c1606d4926b380b16050d2a17054a2d4a09ca140a5f5f6d61705f5f305f5f16014744b116000006d20102a00116002aa10106160116005f0102010900406bd310bd129fb4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b16000c331341317b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1708160801010d0d0d1608010117031702160216003413412f7b160216002b17041603000517050c170616061605314c0f1603160600001707160116000e0c1607d465b06cae16060d2a17064a2d16040c2f4c0aca0d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16014744cb01021601ce001600aba00116002ba10107160116005f01000206004045d3c5f91cb4b4170216024813412d7b1601160000161341357b140a5f5f6d61705f5f305f5f16024744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16024744cb1705160501010d0d0d160501011704170316040005ce01311341327b1604160000010b241341337b160216030e0c1600d4926b380b1604160000030d0e0c140a5f5f6d61705f5f305f5f16024744cb01020100010500403ad3b6398887b4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1704160401010d0d0d16040101170317021603160000010b251341347b160116020e0c1600d465b06cae1603160000020d0e0c140a5f5f6d61705f5f305f5f16014744cb010201000101011fd3e5725392140a5f5f6d61705f5f305f5f16004744cbc5197a4b0418a0010c2f4c020c020c0d0d140a5f5f6d61705f5f305f5f16004744cb010113c40de0b6b3a76400002ca0012d02010001010008d3e5bf78dcb4a0024513412c7b16000008010001010008d34f58efe6b4a0024513412c7b1600a102010002030109d3af1ed9dd1601b9170216001602000b000902",
   codeHash: "06a6db7355978ed027d5a0d36573bf54cef4a67d503b270b8ede5870b3117c7b",
@@ -20314,10 +20414,10 @@ var import_web344 = require("@alephium/web3");
 
 // ../staking/artifacts/XAlphToken.ral.json
 var XAlphToken_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "XAlphToken",
-  bytecode: "091109121b40244051407a40ac40ca411741474165417341a6427842b242d4435d010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00002010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c3314000201010102001bd3d63c543cb41701160148130a7b16000c33130e7b1601b11600ab16011600a9a00016002aa10005160116005f01010106014069d33538a49fb41701160148130a7bce050c33130c7b16000c33130e7ba0010d2aa101140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117021602000ace0431130b7b1602a00100070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a09ca140a5f5f6d61705f5f305f5f16014744b1a0016bd201011601b11600acb11601160056ce051305640c13016417041703b21600a2160147a0014044ce0316031604c11705a00016002ba10006160116005f160502010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004040d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c40290c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0a16020d0c140a5f5f6d61705f5f305f5f16024744cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c16030104",
-  codeHash: "5f95704fd2f96ed987b89fdb6e0659cc32d2accc50194a6bd2aedcffdce2f3e5",
+  bytecode: "0a1509121b40244051407a40ac40ca4117414741654173425d426b42c643b243e0441a443c44c54593010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00102010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c331400020000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d38719c92ea0000201010103014032d38bbc9beeb41701160148130a7b16000c33130e7ba0010c2f4c0216004a041600a001a000000c170216020c33130f7b1601b11602ab16011600a9a00016002aa100a00116022aa101051601160016026016020201010107014078d33538a49fb41701160148130a7bce050c33130c7b16000c33130e7b1600a000a001000c170216020c3313107ba0020d2aa102140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117031603000ace0431130b7b1603a00200070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a09ca140a5f5f6d61705f5f305f5f16014744b1a0026bd201011601b11600acb11601160256ce051305640c13016417051704b21602a2160147a0024044ce0316041605c11706a00016022ba100a00116002ba1010616011600160260160602010701020018d3fe1110a1b4170116000c33130e7ba0010c3313117b16011600a9a00016002aa10008160116005f010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004040d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c40290c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0a16020d0c140a5f5f6d61705f5f305f5f16024744cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c160301050102010701406bd30bdc6a97b41701160148130a7b16014716004044cb17021602c5130d7b0c0e16020104170417030c0c160201050c170516040c334c1ca0010c2f4c0216044a041604a001a000000c170516050c33130f7b1601b11605aba00016042aa100a00116052aa1010c0d0d140a5f5f6d61705f5f305f5f16014744cb01011600000617061606430c2f4c0a16010d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16060c0e0c140a5f5f6d61705f5f305f5f16014744cb010207160116051603160461160502",
+  codeHash: "3329d0319da90857686a9e618c3fa8197226ed9be58b7371314b3247d9fd8e1c",
   fieldsSig: {
     names: [
       "symbol",
@@ -20326,7 +20426,8 @@ var XAlphToken_ral_default = {
       "unstakeVaultTemplateId",
       "maxActiveUnstakeRequestsPerUser",
       "unstakeDuration",
-      "totalStaked",
+      "totalDepositedAlph",
+      "totalXAlphSupply",
       "lastUnstakeVaultIndex",
       "__stdInterfaceId"
     ],
@@ -20339,6 +20440,7 @@ var XAlphToken_ral_default = {
       "U256",
       "U256",
       "U256",
+      "U256",
       "ByteVec"
     ],
     isMutable: [
@@ -20350,6 +20452,7 @@ var XAlphToken_ral_default = {
       false,
       true,
       true,
+      true,
       false
     ]
   },
@@ -20358,10 +20461,12 @@ var XAlphToken_ral_default = {
       name: "Staked",
       fieldNames: [
         "to",
-        "amount"
+        "alphAmount",
+        "xAlphAmount"
       ],
       fieldTypes: [
         "Address",
+        "U256",
         "U256"
       ]
     },
@@ -20369,6 +20474,34 @@ var XAlphToken_ral_default = {
       name: "UnstakeScheduled",
       fieldNames: [
         "to",
+        "xAlphAmount",
+        "alphAmount"
+      ],
+      fieldTypes: [
+        "Address",
+        "U256",
+        "U256"
+      ]
+    },
+    {
+      name: "UnstakeCancelled",
+      fieldNames: [
+        "to",
+        "xAlphAmount",
+        "claimedAlphAmount",
+        "restakedAlphAmount"
+      ],
+      fieldTypes: [
+        "Address",
+        "U256",
+        "U256",
+        "U256"
+      ]
+    },
+    {
+      name: "RewardDeposited",
+      fieldNames: [
+        "from",
         "amount"
       ],
       fieldTypes: [
@@ -20552,6 +20685,36 @@ var XAlphToken_ral_default = {
         "ByteVec"
       ]
     },
+    {
+      name: "mulDiv",
+      paramNames: [
+        "a",
+        "b",
+        "denominator"
+      ],
+      paramTypes: [
+        "U256",
+        "U256",
+        "U256"
+      ],
+      paramIsMutable: [
+        false,
+        false,
+        true
+      ],
+      returnTypes: [
+        "U256"
+      ]
+    },
+    {
+      name: "getTotalDepositedAlph",
+      paramNames: [],
+      paramTypes: [],
+      paramIsMutable: [],
+      returnTypes: [
+        "U256"
+      ]
+    },
     {
       name: "stake",
       paramNames: [
@@ -20563,7 +20726,9 @@ var XAlphToken_ral_default = {
       paramIsMutable: [
         false
       ],
-      returnTypes: []
+      returnTypes: [
+        "U256"
+      ]
     },
     {
       name: "startUnstake",
@@ -20580,6 +20745,19 @@ var XAlphToken_ral_default = {
         "ByteVec"
       ]
     },
+    {
+      name: "depositReward",
+      paramNames: [
+        "amount"
+      ],
+      paramTypes: [
+        "U256"
+      ],
+      paramIsMutable: [
+        false
+      ],
+      returnTypes: []
+    },
     {
       name: "getActiveUnstakeVaultIndexes",
       paramNames: [
@@ -20628,6 +20806,21 @@ var XAlphToken_ral_default = {
         false
       ],
       returnTypes: []
+    },
+    {
+      name: "cancelUnstake",
+      paramNames: [
+        "vaultIndex"
+      ],
+      paramTypes: [
+        "U256"
+      ],
+      paramIsMutable: [
+        false
+      ],
+      returnTypes: [
+        "U256"
+      ]
     }
   ],
   constants: [
@@ -20666,6 +20859,25 @@ var XAlphToken_ral_default = {
         }
       ]
     },
+    {
+      name: "FullMathError",
+      fields: [
+        {
+          name: "DivByZero",
+          value: {
+            type: "U256",
+            value: "350"
+          }
+        },
+        {
+          name: "MulDivOverflow",
+          value: {
+            type: "U256",
+            value: "351"
+          }
+        }
+      ]
+    },
     {
       name: "ErrorCodes",
       fields: [
@@ -20703,6 +20915,27 @@ var XAlphToken_ral_default = {
             type: "U256",
             value: "14"
           }
+        },
+        {
+          name: "ZeroXAlphOutput",
+          value: {
+            type: "U256",
+            value: "15"
+          }
+        },
+        {
+          name: "ZeroAlphOutput",
+          value: {
+            type: "U256",
+            value: "16"
+          }
+        },
+        {
+          name: "NoStakers",
+          value: {
+            type: "U256",
+            value: "17"
+          }
         }
       ]
     }
@@ -20728,7 +20961,12 @@ var Factory33 = class extends import_web344.ContractFactory {
       AllStructs2
     );
   }
-  eventIndex = { Staked: 0, UnstakeScheduled: 1 };
+  eventIndex = {
+    Staked: 0,
+    UnstakeScheduled: 1,
+    UnstakeCancelled: 2,
+    RewardDeposited: 3
+  };
   consts = {
     IntByteLength: BigInt("32"),
     ErrorCode: {
@@ -20736,12 +20974,16 @@ var Factory33 = class extends import_web344.ContractFactory {
       IndexOutOfBound: BigInt("551"),
       InvalidByteVecLength: BigInt("552")
     },
+    FullMathError: { DivByZero: BigInt("350"), MulDivOverflow: BigInt("351") },
     ErrorCodes: {
       AssetAddressCallerOnly: BigInt("10"),
       TooManyActiveUnstakeVaults: BigInt("11"),
       InvalidUnstakeDuration: BigInt("12"),
       NonExistantUnstakeVault: BigInt("13"),
-      AmountMustBeGreaterThanZero: BigInt("14")
+      AmountMustBeGreaterThanZero: BigInt("14"),
+      ZeroXAlphOutput: BigInt("15"),
+      ZeroAlphOutput: BigInt("16"),
+      NoStakers: BigInt("17")
     }
   };
   at(address) {
@@ -20784,12 +21026,26 @@ var Factory33 = class extends import_web344.ContractFactory {
     empty: async (params) => {
       return (0, import_web344.testMethod)(this, "empty", params, getContractByCodeHash3);
     },
+    mulDiv: async (params) => {
+      return (0, import_web344.testMethod)(this, "mulDiv", params, getContractByCodeHash3);
+    },
+    getTotalDepositedAlph: async (params) => {
+      return (0, import_web344.testMethod)(
+        this,
+        "getTotalDepositedAlph",
+        params,
+        getContractByCodeHash3
+      );
+    },
     stake: async (params) => {
       return (0, import_web344.testMethod)(this, "stake", params, getContractByCodeHash3);
     },
     startUnstake: async (params) => {
       return (0, import_web344.testMethod)(this, "startUnstake", params, getContractByCodeHash3);
     },
+    depositReward: async (params) => {
+      return (0, import_web344.testMethod)(this, "depositReward", params, getContractByCodeHash3);
+    },
     getActiveUnstakeVaultIndexes: async (params) => {
       return (0, import_web344.testMethod)(
         this,
@@ -20808,6 +21064,9 @@ var Factory33 = class extends import_web344.ContractFactory {
     },
     claimUnstaked: async (params) => {
       return (0, import_web344.testMethod)(this, "claimUnstaked", params, getContractByCodeHash3);
+    },
+    cancelUnstake: async (params) => {
+      return (0, import_web344.testMethod)(this, "cancelUnstake", params, getContractByCodeHash3);
     }
   };
   stateForTest(initFields, asset, address, maps) {
@@ -20817,8 +21076,8 @@ var Factory33 = class extends import_web344.ContractFactory {
 var XAlphToken = new Factory33(
   import_web344.Contract.fromJson(
     XAlphToken_ral_default,
-    "=52-2+91=2+c=1-1=2+e=1-1=2-2+8f=857-1+b=235-1+b=34+7a7e0214696e73657274206174206d617020706174683a2000=333-1+2=79-1+b=69-1+c=40+7a7e021472656d6f7665206174206d617020706174683a2000=70",
-    "8ded2201203cffd39adc32f6278f37f0ef1a543cf34872a159a1f36de68620d4",
+    "=60+c=1-1=2-6+f9=3-1+3=2-1+5=2+4f74=1-2+de=1433-1+a=269-1+b=34+7a7e0214696e73657274206174206d617020706174683a2000=443-1+2=79-1+b=69-1+c=40+7a7e021472656d6f7665206174206d617020706174683a2000=83-1+d=273-1+c=40+7a7e021472656d6f7665206174206d617020706174683a2000=84",
+    "1a0bd323d964c45cd5451b7d7d049316f533d194800f0fe76892bddee137f8ce",
     AllStructs2
   )
 );
@@ -20858,6 +21117,24 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
       fromCount
     );
   }
+  subscribeUnstakeCancelledEvent(options, fromCount) {
+    return (0, import_web344.subscribeContractEvent)(
+      XAlphToken.contract,
+      this,
+      options,
+      "UnstakeCancelled",
+      fromCount
+    );
+  }
+  subscribeRewardDepositedEvent(options, fromCount) {
+    return (0, import_web344.subscribeContractEvent)(
+      XAlphToken.contract,
+      this,
+      options,
+      "RewardDeposited",
+      fromCount
+    );
+  }
   subscribeAllEvents(options, fromCount) {
     return (0, import_web344.subscribeContractEvents)(
       XAlphToken.contract,
@@ -20969,6 +21246,24 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
         getContractByCodeHash3
       );
     },
+    mulDiv: async (params) => {
+      return (0, import_web344.callMethod)(
+        XAlphToken,
+        this,
+        "mulDiv",
+        params,
+        getContractByCodeHash3
+      );
+    },
+    getTotalDepositedAlph: async (params) => {
+      return (0, import_web344.callMethod)(
+        XAlphToken,
+        this,
+        "getTotalDepositedAlph",
+        params === void 0 ? {} : params,
+        getContractByCodeHash3
+      );
+    },
     stake: async (params) => {
       return (0, import_web344.callMethod)(
         XAlphToken,
@@ -20987,6 +21282,15 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
         getContractByCodeHash3
       );
     },
+    depositReward: async (params) => {
+      return (0, import_web344.callMethod)(
+        XAlphToken,
+        this,
+        "depositReward",
+        params,
+        getContractByCodeHash3
+      );
+    },
     getActiveUnstakeVaultIndexes: async (params) => {
       return (0, import_web344.callMethod)(
         XAlphToken,
@@ -21013,6 +21317,15 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
         params,
         getContractByCodeHash3
       );
+    },
+    cancelUnstake: async (params) => {
+      return (0, import_web344.callMethod)(
+        XAlphToken,
+        this,
+        "cancelUnstake",
+        params,
+        getContractByCodeHash3
+      );
     }
   };
   transact = {
@@ -21052,12 +21365,26 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
     empty: async (params) => {
       return (0, import_web344.signExecuteMethod)(XAlphToken, this, "empty", params);
     },
+    mulDiv: async (params) => {
+      return (0, import_web344.signExecuteMethod)(XAlphToken, this, "mulDiv", params);
+    },
+    getTotalDepositedAlph: async (params) => {
+      return (0, import_web344.signExecuteMethod)(
+        XAlphToken,
+        this,
+        "getTotalDepositedAlph",
+        params
+      );
+    },
     stake: async (params) => {
       return (0, import_web344.signExecuteMethod)(XAlphToken, this, "stake", params);
     },
     startUnstake: async (params) => {
       return (0, import_web344.signExecuteMethod)(XAlphToken, this, "startUnstake", params);
     },
+    depositReward: async (params) => {
+      return (0, import_web344.signExecuteMethod)(XAlphToken, this, "depositReward", params);
+    },
     getActiveUnstakeVaultIndexes: async (params) => {
       return (0, import_web344.signExecuteMethod)(
         XAlphToken,
@@ -21071,6 +21398,9 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
     },
     claimUnstaked: async (params) => {
       return (0, import_web344.signExecuteMethod)(XAlphToken, this, "claimUnstaked", params);
+    },
+    cancelUnstake: async (params) => {
+      return (0, import_web344.signExecuteMethod)(XAlphToken, this, "cancelUnstake", params);
     }
   };
   async multicall(callss) {
@@ -21086,44 +21416,11 @@ var XAlphTokenInstance = class extends import_web344.ContractInstance {
 // ../staking/artifacts/ts/scripts.ts
 var import_web346 = require("@alephium/web3");
 
-// ../staking/artifacts/AlphStakeAndLock.ral.json
-var AlphStakeAndLock_ral_default = {
-  version: "v4.2.5",
-  name: "AlphStakeAndLock",
-  bytecodeTemplate: "01010300020018b417001600{2}a2{2}0d0c{0}010c0c0d{1}010c170116001601{2}a3{2}0d0c{1}010f",
-  fieldsSig: {
-    names: [
-      "xAlphToken",
-      "xAlphStakeVault",
-      "amount"
-    ],
-    types: [
-      "XAlphToken",
-      "XAlphStakeVault",
-      "U256"
-    ],
-    isMutable: [
-      false,
-      false,
-      false
-    ]
-  },
-  functions: [
-    {
-      name: "main",
-      paramNames: [],
-      paramTypes: [],
-      paramIsMutable: [],
-      returnTypes: []
-    }
-  ]
-};
-
 // ../staking/artifacts/XAlphUnlockAndStartUnstake.ral.json
 var XAlphUnlockAndStartUnstake_ral_default = {
-  version: "v4.2.5",
+  version: "v4.3.1",
   name: "XAlphUnlockAndStartUnstake",
-  bytecodeTemplate: "01010300020016b41700{2}0d0c{1}01100c0d{1}010c170116001601{2}a3{2}0d0d{0}010d18",
+  bytecodeTemplate: "01010300020016b41700{2}0d0c{1}01100c0d{1}010c170116001601{2}a3{2}0d0d{0}010f18",
   fieldsSig: {
     names: [
       "xAlphToken",
@@ -21153,10 +21450,6 @@ var XAlphUnlockAndStartUnstake_ral_default = {
 };
 
 // ../staking/artifacts/ts/scripts.ts
-var AlphStakeAndLock = new import_web346.ExecutableScript(
-  import_web346.Script.fromJson(AlphStakeAndLock_ral_default, "", AllStructs2),
-  getContractByCodeHash3
-);
 var XAlphUnlockAndStartUnstake = new import_web346.ExecutableScript(
   import_web346.Script.fromJson(XAlphUnlockAndStartUnstake_ral_default, "", AllStructs2),
   getContractByCodeHash3
@@ -21167,30 +21460,30 @@ var deployments_testnet_default3 = {
   deployerAddress: "16j6oMwCc768CSjXst5ftHwyu7gUn6PvCX7YVvAQWWbZ2",
   contracts: {
     AlphUnstakeVault: {
-      txId: "36ad2eb4a64bcc3b89441a0f0775dd57fbefe02ad6e647680f830217c8d80f9f",
-      unsignedTx: "000101010103000000081500551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78113c4016345785d8a0000a2144198060540ea40f841384172418c0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020001000bd38e18691cb417001600ce00774513147bce01b014402b050300040300000000000000000000000000000000000000000000000000000000000000000200020002001403010200ad188000e2aac1174876e80001aaa31a3b5062a1147e3559b7fcb53ab81ac66522b83e13ac0ec1738cf7ad0a43e97914770002aa2b00c7436014a228d1aac67b64daf32f482052c2186c0efc78d9784ef0a19401c463d9bafbc3883a7600551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78100000000000000000000",
-      signature: "ba1361ee2f4aebad5dbe1d4d374c28e503575318a1d0d13e4b48c0a6877e4b8031749843b7c639d9b853594d181f48c0189510e9c247f33d3d90abde01a7fb03",
+      txId: "6092ef0766df50555de8d5a45d4aa4ae04dcec7f70d07f28b94de70226ad3940",
+      unsignedTx: "000101010103000000081500551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78113c4016345785d8a0000a21441d4060640ea40f84138417241ac41c60000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020004021ed34a517d1bb417001600ce00774513147b00021701ce02a0002b1702160216012b170316030c334c04ce00771603a8160116030201020001000bd38e18691cb417001600ce00774513147bce01b014402b050300040300000000000000000000000000000000000000000000000000000000000000000200020002001403010200ad188000e322c1174876e80002aaa31a3b2e509dbe5452737e606a53b6de3e3523d31c6ee1097208b05716b032775942b50002aa2b00c7436014a228d1aac67b64daf32f482052c2186c0efc78d9784ef0a194aaa31a3b439fdabf9a91b3c44dfa4a775ff16f4d5bc1a2b0df5e8a7ad4e44e9ec754d8530301c4d9e54c44a8bb0ec200551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78100000000000000000000",
+      signature: "a10bac9690aa875a4ff59b5266d2b49a520cb4726824937dcc335207203ca93774849a8a25118704453c39ca9faddca248275cc2a2a200dfaac7e5a92be0a62d",
       gasPrice: "100000000000",
-      gasAmount: 58026,
-      blockHash: "0000005cfe48f0844e82228b25567d14e12b8889eae8152045758c3e8acaea30",
-      codeHash: "cdc7cec3c418bb3e4f7f43d28a151fbe950e6429ff56c060c04d0f207cd4e5a4",
+      gasAmount: 58146,
+      blockHash: "000000c4a4967f816913128d3a3636d856c782fdb39fd413deda8c84fb371bc0",
+      codeHash: "bf0deb5e0257226e4e274b21854a298663f2bad7a3b2d38b134f5e1642103a46",
       contractInstance: {
-        address: "211Z8st6gChA7GMXboHH2jepvGhyksnDUQ7nkzgZrcTeo",
-        contractId: "5dea2d84f611879bf5d9486bd6b0f7e590f0b6cdbf50fb8062ea94a70fef8d00",
+        address: "21USNdUoQk4cRgR6ohyyA1LWdV1Tu3WpMQgmbXfxWZddR",
+        contractId: "64cd367b37ac800192270f9b8456e9a4678e71a0991719d366cdd282e643bd00",
         groupIndex: 0
       }
     },
     XAlphToken: {
-      txId: "d0efd4c2375b501ac8d69612d633f6ab87e2d06be74942be768d7f425f6c0390",
-      unsignedTx: "000101010103000000091500551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78113c4016345785d8a0000a214437e091109121b40244051407a40ac40ca411741474165417341a6427842b242d4435d010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00002010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c3314000201010102001bd3d63c543cb41701160148130a7b16000c33130e7b1601b11600ab16011600a9a00016002aa10005160116005f01010106014069d33538a49fb41701160148130a7bce050c33130c7b16000c33130e7ba0010d2aa101140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117021602000ace0431130b7b1602a00100070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a09ca140a5f5f6d61705f5f305f5f16014744b1a0016bd201011601b11600acb11601160056ce051305640c13016417041703b21600a2160147a0014044ce0316031604c11705a00016002ba10006160116005f160502010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004040d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c40290c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0a16020d0c140a5f5f6d61705f5f305f5f16024744cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c1603010414404a07030558414c5048030b5374616b656420414c504802120340205dea2d84f611879bf5d9486bd6b0f7e590f0b6cdbf50fb8062ea94a70fef8d00021002c09a7ec8000306414c504800011405020200020013c8033b2e3c9fd0803ce8000000ae188000e6ddc1174876e80001aaa31a3b25ad7129900a12a0855ce79fec7338a1c60ae9d9bce40de14794cae54f8bca3d0002aa2b00c7436014a228d1aac67b64daf32f482052c2186c0efc78d9784ef0a19401c45c8013d8c10e0a7600551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78100000000000000000000",
-      signature: "3407dc308b6427d361e73fbbc7313060afdf88f8c1a4571986176bbf3831e2b60cd78d2e3384e40cfa54ff86d32bdcbf9a8929515bcb40f9af20d1efb1faa210",
+      txId: "bb061c722e67999888f9da215ee5d11ac296254c1931c9a2f10d88a996fef877",
+      unsignedTx: "000101010103000000091500551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78113c4016345785d8a0000a21445bc0a1509121b40244051407a40ac40ca4117414741654173425d426b42c643b243e0441a443c44c54593010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00102010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c331400020000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d38719c92ea0000201010103014032d38bbc9beeb41701160148130a7b16000c33130e7ba0010c2f4c0216004a041600a001a000000c170216020c33130f7b1601b11602ab16011600a9a00016002aa100a00116022aa101051601160016026016020201010107014078d33538a49fb41701160148130a7bce050c33130c7b16000c33130e7b1600a000a001000c170216020c3313107ba0020d2aa102140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117031603000ace0431130b7b1603a00200070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a09ca140a5f5f6d61705f5f305f5f16014744b1a0026bd201011601b11600acb11601160256ce051305640c13016417051704b21602a2160147a0024044ce0316041605c11706a00016022ba100a00116002ba1010616011600160260160602010701020018d3fe1110a1b4170116000c33130e7ba0010c3313117b16011600a9a00016002aa10008160116005f010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004040d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c40290c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0a16020d0c140a5f5f6d61705f5f305f5f16024744cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c160301050102010701406bd30bdc6a97b41701160148130a7b16014716004044cb17021602c5130d7b0c0e16020104170417030c0c160201050c170516040c334c1ca0010c2f4c0216044a041604a001a000000c170516050c33130f7b1601b11605aba00016042aa100a00116052aa1010c0d0d140a5f5f6d61705f5f305f5f16014744cb01011600000617061606430c2f4c0a16010d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16060c0e0c140a5f5f6d61705f5f305f5f16014744cb01020716011605160316046116050214404a07030558414c5048030b5374616b656420414c5048021203402064cd367b37ac800192270f9b8456e9a4678e71a0991719d366cdd282e643bd00021002c09a7ec8000306414c5048000114070302000200020013c8033b2e3c9fd0803ce8000000ae188000eb7bc1174876e80001aaa31a3b4201332436427317efe44f863da85164ba97602993ee22dc809e2cbe2d2b89c30002aa2b00c7436014a228d1aac67b64daf32f482052c2186c0efc78d9784ef0a19401c4d86c9c17531796c200551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78100000000000000000000",
+      signature: "831475506c2ba54d79fa311500147382f0ac1d9f0c8ca442236570a5cd587f5e73667766699f59ca2c6614ceb3b1b44c26373c2d0a8277b9ce93b311cd123b2f",
       gasPrice: "100000000000",
-      gasAmount: 59101,
-      blockHash: "000000aff89ba10a3749c17a394741b90c7d076db81300a3b5db4d589c9deed0",
-      codeHash: "19e6ebe6ce7c8a3e338d3fd9696fb8dbe965893904c9ff5cd99116109ce56273",
+      gasAmount: 60283,
+      blockHash: "0000003e3a3e4e8274cb90a34935486537776251d8b8d93104d713b743dc5f60",
+      codeHash: "f4039c38cfc0b31b9c3fe50b345838ae08bf551bebb7c99f3f1acc78066f21dd",
       contractInstance: {
-        address: "2BnHxjxAaPgkpHQrU7DzrwHnpR7f8FNrk18HqkMKjB5xB",
-        contractId: "fdf5067af438da490b166c913768a646fd34c3891957b350cbf87820ae77ad00",
+        address: "24xXXkWiAiV1oX7jAauDTYmoPzcWuDjPiA7QU9MPo4QWT",
+        contractId: "98925e1a2a1693d0641670148a6f174dbc766ed9387d90b291882db92edc2a00",
         groupIndex: 0
       },
       issueTokenAmount: "1000000000000000000000000000"
@@ -21224,16 +21517,16 @@ var deployments_testnet_default3 = {
       }
     },
     XAlphStakeVault: {
-      txId: "4d65707e5baf56d589f3c3941677cdba98b4fa4745d7f1f025b71a89fbcc4817",
-      unsignedTx: "000101010103000000081500551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78113c4016345785d8a0000a21445d705174028407340af40cc40fc411a41284136414f41a341c341cd41db42234241431043f0448b451145604577458e45a7010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a62170516051602000a1702160413202a17044a2c160271a000712f02000002020110160071160171314c051600160144000b4a041601160044000b0200000101010316004f02010000000103d3b299f80ace000201000102021ed3f87904e4140a5f5f6d61705f5f305f5f16004744cbc5194c040c0006024a110c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010108d32b875d11140a5f5f6d61705f5f305f5f16004744cbc5020101010800405fd3d63c543cb4170116014813412d7b16000c331341307b1601ce001600ac140a5f5f6d61705f5f305f5f16014744cbc54c40370c0d0d140a5f5f6d61705f5f305f5f16014744cb1707160701010d0d0d1607010117031702160216002a0c0e0c140a5f5f6d61705f5f305f5f16014744cb01021603000517040c170516051604314c0f1603160500001706160116000e0c1606d4926b380b16050d2a17054a2d4a09ca140a5f5f6d61705f5f305f5f16014744b116000006d20102a00116002aa10106160116005f0102010900406bd310bd129fb4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b16000c331341317b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1708160801010d0d0d1608010117031702160216003413412f7b160216002b17041603000517050c170616061605314c0f1603160600001707160116000e0c1607d465b06cae16060d2a17064a2d16040c2f4c0aca0d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16014744cb01021601ce001600aba00116002ba10107160116005f01000206004045d3c5f91cb4b4170216024813412d7b1601160000161341357b140a5f5f6d61705f5f305f5f16024744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16024744cb1705160501010d0d0d160501011704170316040005ce01311341327b1604160000010b241341337b160216030e0c1600d4926b380b1604160000030d0e0c140a5f5f6d61705f5f305f5f16024744cb01020100010500403ad3b6398887b4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1704160401010d0d0d16040101170317021603160000010b251341347b160116020e0c1600d465b06cae1603160000020d0e0c140a5f5f6d61705f5f305f5f16014744cb010201000101011fd3e5725392140a5f5f6d61705f5f305f5f16004744cbc5197a4b0418a0010c2f4c020c020c0d0d140a5f5f6d61705f5f305f5f16004744cb010113c40de0b6b3a76400002ca0012d02010001010008d3e5bf78dcb4a0024513412c7b16000008010001010008d34f58efe6b4a0024513412c7b1600a102010002030109d3af1ed9dd1601b9170216001602000b00090214402602034020fdf5067af438da490b166c913768a646fd34c3891957b350cbf87820ae77ad00020a144048030340209d203f022693e95c512474ee9d788706c567247b6862b802b90355fcc46784a202000400551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e781ad188000eb69c1174876e80002aaa31a3b2cd52d7ce3a8ce5d59e5ae88e7d11cef7b8c31d3f74d55051412367f6bc1e92a0002aa2b00c7436014a228d1aac67b64daf32f482052c2186c0efc78d9784ef0a194aaa31a3b9cf7d98fff4154d2fdf629284fa96e8275b040537070a04446ee303b8d6c50ba0301c4891ecbb280614adc00551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78100000000000000000000",
-      signature: "f02c9f5d77b79b5c2af9558180381295d3d8a0598cf8e909d1f582606a6b9469243af28fb1570c72550fce5733c28f58b11f022fbbeff64a12f628669fc4afcc",
+      txId: "69d5cdd9527fe3a6a0e5e9f803ad7d57d4e8b2c7b5be64c6b5a7abfb72b719d4",
+      unsignedTx: "000101010103000000081500551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78113c4016345785d8a0000a21445d705174028407340af40cc40fc411a41284136414f41a341c341cd41db42234241431043f0448b451145604577458e45a7010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a62170516051602000a1702160413202a17044a2c160271a000712f02000002020110160071160171314c051600160144000b4a041601160044000b0200000101010316004f02010000000103d3b299f80ace000201000102021ed3f87904e4140a5f5f6d61705f5f305f5f16004744cbc5194c040c0006024a110c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010108d32b875d11140a5f5f6d61705f5f305f5f16004744cbc5020101010800405fd3d63c543cb4170116014813412d7b16000c331341307b1601ce001600ac140a5f5f6d61705f5f305f5f16014744cbc54c40370c0d0d140a5f5f6d61705f5f305f5f16014744cb1707160701010d0d0d1607010117031702160216002a0c0e0c140a5f5f6d61705f5f305f5f16014744cb01021603000517040c170516051604314c0f1603160500001706160116000e0c1606d4926b380b16050d2a17054a2d4a09ca140a5f5f6d61705f5f305f5f16014744b116000006d20102a00116002aa10106160116005f0102010900406bd310bd129fb4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b16000c331341317b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1708160801010d0d0d1608010117031702160216003413412f7b160216002b17041603000517050c170616061605314c0f1603160600001707160116000e0c1607d465b06cae16060d2a17064a2d16040c2f4c0aca0d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16014744cb01021601ce001600aba00116002ba10107160116005f01000206004045d3c5f91cb4b4170216024813412d7b1601160000161341357b140a5f5f6d61705f5f305f5f16024744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16024744cb1705160501010d0d0d160501011704170316040005ce01311341327b1604160000010b241341337b160216030e0c1600d4926b380b1604160000030d0e0c140a5f5f6d61705f5f305f5f16024744cb01020100010500403ad3b6398887b4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1704160401010d0d0d16040101170317021603160000010b251341347b160116020e0c1600d465b06cae1603160000020d0e0c140a5f5f6d61705f5f305f5f16014744cb010201000101011fd3e5725392140a5f5f6d61705f5f305f5f16004744cbc5197a4b0418a0010c2f4c020c020c0d0d140a5f5f6d61705f5f305f5f16004744cb010113c40de0b6b3a76400002ca0012d02010001010008d3e5bf78dcb4a0024513412c7b16000008010001010008d34f58efe6b4a0024513412c7b1600a102010002030109d3af1ed9dd1601b9170216001602000b0009021440260203402098925e1a2a1693d0641670148a6f174dbc766ed9387d90b291882db92edc2a00020a144048030340209d203f022693e95c512474ee9d788706c567247b6862b802b90355fcc46784a202000400551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e781ad188000eb69c1174876e80001aaa31a3bfd4455fce1dbd299d3ab30e6eb6b2e0e922374fb64ef989412d416efba15e76b0002aa2b00c7436014a228d1aac67b64daf32f482052c2186c0efc78d9784ef0a19401c5011415977ed688d80000551362cc76354454f639b640f9c898aa72cf097706ad51d8fbcb2fcb4b65e78100000000000000000000",
+      signature: "cb73ee8805c844e056151417c2eabd0d5a0f0742131fd0da8b96d71041dc8f006255765cf93f088e75f0c58e80c310d5210522fc7d549bf9a32fd19aab2e1982",
       gasPrice: "100000000000",
       gasAmount: 60265,
-      blockHash: "000000064709ddf4dcb27cd606ae682caa4e05b25e0da635e8b3440bd5dcbfb0",
-      codeHash: "16a37508b26e9522baf304b39ed18846da97112687dd13aa560c6c18cae39e6e",
+      blockHash: "000000cdeb7bcef5505bbc372de05bbfd724e97b576b4a63be867b6d511a9d30",
+      codeHash: "2e4bbab6b2a7948e9a926b50550a3ddffb0ae44a414082d4d5f7f161ff4b92d0",
       contractInstance: {
-        address: "2AAtQ91a2kFv2xLEdaU9DSR7QJJSFuHX7SRKVy3wuGWTq",
-        contractId: "e6075e494aa5a1fd2a59aec971d165b2913eac6c20dbb852c2a39cf9842dd300",
+        address: "uEsgEN1ByDoFLSkxERDuQ3juaB2Lq6nHRHQHEhUuycpF",
+        contractId: "082d9216ce6cd58e29f34150121f4a3931dddb16109c2301e69a08cecb4a6700",
         groupIndex: 0
       }
     }
@@ -21247,72 +21540,73 @@ var deployments_devnet_default3 = {
   deployerAddress: "1DrDyTr9RpRsQnDnXo2YRiPzPW4ooHX5LLoqXrqfMrpQH",
   contracts: {
     AlphUnstakeVault: {
-      txId: "5d1b4e3d691a02df4b53a9992c2e9a96b4e392a5c0889de02688a293bd99c785",
-      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a2144198060540ea40f841384172418c0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020001000bd38e18691cb417001600ce00774513147bce01b014402b050300040300000000000000000000000000000000000000000000000000000000000000000200020002001403010200ad188000e2aac1174876e8000137a4444713f113d86f559e1e84171b1a3b40f6218d5ab90700dd8c5e85f2e7123833e11e000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c6b85ed9214f8f1f1e900000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
-      signature: "ca5285b7a549134e7968b69fb733d376b923a5eca2fd41bf0e4eb75cb0244dd3345016ddd9b8397c585b875307959909caf109849924679976dbde317fc7be9c",
+      txId: "16a8a22c51be10366482156b0636d60e4c25f65aa9a106ed1ba60e66a6314cd4",
+      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a21441c1060640ea40f841384172419941b30000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f02010200020113d32bc3cebdb417001600ce00774513147bce02a0002b1701ce00771601a816010201020001000bd38e18691cb417001600ce00774513147bce01b014402b050300040300000000000000000000000000000000000000000000000000000000000000000200020002001403010200ad188000e2fcc1174876e8000137a44447b2131bc1d38995e2b3de8e50d1b8604ecfaaba267d3c183741c7febafbae43f6000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c751b028106515834bac980000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
+      signature: "4c69d8455a2fac528ee94beff73f2490dd2d9f1fc04a505d3e4f00c1777c093c518daebf52fbe6cc0012b36daafda466d8c46735457e038a80cac4f23aa01c12",
       gasPrice: "100000000000",
-      gasAmount: 58026,
-      blockHash: "0474d8bb002ba67ad14daeb77399431db2038a5a40640055ca47ebecfde690e0",
-      codeHash: "cdc7cec3c418bb3e4f7f43d28a151fbe950e6429ff56c060c04d0f207cd4e5a4",
+      gasAmount: 58108,
+      blockHash: "013189d6fc7f7fc93a7005a6226aff299792d750b318fb03bd5acf8a6ce83990",
+      codeHash: "1a32644728103165e4acccf7237073aaf50bd355dd1475663e518795352177cd",
       contractInstance: {
-        address: "vVaqDXgWSb21kJjJRbdvB9VtaVR1QzhmEbE9vYjpijdR",
-        contractId: "1acdec45831016d1cbc02a86046186189874216703d81af9d17d80a6a08e4b00",
+        address: "2Bu1aZPaD7wbEjuABPH9SmoUU76rFGZgRwpBBVeoN8FtK",
+        contractId: "ffad913961ec8994fbdf4b6eeba50f9413cfb99db652dd50ed40ebd8fc149700",
         groupIndex: 0
       }
     },
     XAlphToken: {
-      txId: "419f046f3dde9f00d62a885727c0ea6c33c3637556f97172900ecf3b5ca043a2",
-      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a21443b0091109121b40244051407a40ac40ca411741474165417341a6429142cb42ed438f010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00002010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c3314000201010102001bd3d63c543cb41701160148130a7b16000c33130e7b1601b11600ab16011600a9a00016002aa10005160116005f0101010601406bd33538a49fb41701160148130a7bce050c33130c7b16000c33130e7ba0010d2aa101140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117021602000ace0431130b7b1602a00100070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a0bca140a5f5f6d61705f5f305f5f160147447a7e0214696e73657274206174206d617020706174683a2000b1a0016bd201011601b11600acb11601160056ce051305640c13016417041703b21600a2160147a0014044ce0316031604c11705a00016002ba10006160116005f160502010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004042d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c402b0c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0c16020d0c140a5f5f6d61705f5f305f5f160247447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c1603010414404907030558414c5048030b5374616b656420414c504802120340201acdec45831016d1cbc02a86046186189874216703d81af9d17d80a6a08e4b000210028000ea600306414c5048000114050202000200ad188000e730c1174876e8000137a444477f7b4b7130c2284dcf645bc7c3a02145dad57a952c8c6403f3e039829a626c6d000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c6b85ed7a90355dff1100000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
-      signature: "8de92f39d121f6572f78a302127d8853d03932a154b65fef58a1e45e6ae595c7297f7e2f50c940de534b12f149f79e32d74c0636190cab6f9b8cee6aa6407498",
+      txId: "f1d8fcbb9d468ee06533d083554d49f5c99f0b41a68134ff2e36cc881d66436f",
+      unsignedTx: "000401010103000000091500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a21445fa0a1509121b40244051407a40ac40ca4117414741654173425d426b42c643cb43f94433445544f745d1010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00102010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c331400020000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d38719c92ea0000201010103014032d38bbc9beeb41701160148130a7b16000c33130e7ba0010c2f4c0216004a041600a001a000000c170216020c33130f7b1601b11602ab16011600a9a00016002aa100a00116022aa10105160116001602601602020101010701407ad33538a49fb41701160148130a7bce050c33130c7b16000c33130e7b1600a000a001000c170216020c3313107ba0020d2aa102140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117031603000ace0431130b7b1603a00200070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a0bca140a5f5f6d61705f5f305f5f160147447a7e0214696e73657274206174206d617020706174683a2000b1a0026bd201011601b11600acb11601160256ce051305640c13016417051704b21602a2160147a0024044ce0316041605c11706a00016022ba100a00116002ba1010616011600160260160602010701020018d3fe1110a1b4170116000c33130e7ba0010c3313117b16011600a9a00016002aa10008160116005f010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004042d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c402b0c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0c16020d0c140a5f5f6d61705f5f305f5f160247447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c1603010501020106014065d30bdc6a97b41701160148130a7b16014716004044cb17021602c5130d7b0c0d1602010417030c0c16020105a0010c2f4c0216034a041603a001a000000c170416040c33130f7b1601b11604aba00016032aa100a00116042aa1010c0d0d140a5f5f6d61705f5f305f5f16014744cb01011600000617051605430c2f4c0c16010d0c140a5f5f6d61705f5f305f5f160147447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16014744cb0102071601160416036016040214404907030558414c5048030b5374616b656420414c50480212034020ffad913961ec8994fbdf4b6eeba50f9413cfb99db652dd50ed40ebd8fc1497000210028000ea600306414c5048000114070302000200020013c8033b2e3c9fd0803ce8000000ae188000ebf6c1174876e8000137a44447137e9bd694f4f19c1398b57ff0f1a8838452fffa4b1629ea24f3c6e83b38b5dc000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c751b0280eec5a2624e7a80000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
+      signature: "c462d4ca9f4ab6c1c0d37bb4f34b6f02deae0f7f81f93ac1f76a0f083dd8dabc309f1a077d34323a00a60f1ce679ec6af1ac01fcec313c71715477da7ca7f4a5",
       gasPrice: "100000000000",
-      gasAmount: 59184,
-      blockHash: "0a45f073ea3b7a3e43dda2bcc30dc82db263469bae16d49433850e7b618dfc00",
-      codeHash: "ff82445fd49b9aa5904a68c1aad286b3fedb9b314d840ff35f687c78fb52201d",
+      gasAmount: 60406,
+      blockHash: "00fb06e284202d908de8943e86d3c98bb2673ee501d54974ddf4581266ccf0f0",
+      codeHash: "c97645db943c8c70c4e5fd49e6060446d9f66183f077204d107c52bc471342c4",
       contractInstance: {
-        address: "u8vQcnnKuncdvooyN4EDU7fXFRNkdMKNFVF8QU1qBQzB",
-        contractId: "06a72c6ce8eb96c1d40fd6c2bfbc51e522cae9ec355d9c63ff6c8a8fcd119100",
+        address: "uVBXGxD2rSb8dms1rf4dcGV2YxvK3B55nGw2DKH9uw6f",
+        contractId: "0bd7e14c31b8979dcdc10da8eb346d9578b2decb983d2cd0d74c888215d84900",
         groupIndex: 0
-      }
+      },
+      issueTokenAmount: "1000000000000000000000000000"
     },
-    RewardSharingVault: {
-      txId: "bda7709b86eb33e62548d1f29361d5f96dd4887d840e46b62386312788d2206a",
-      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a2144360040740d04184426e42a942bb42f2435001000208004056d3926b380bb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc54c40270c0d0d140a5f5f6d61705f5f305f5f16004744cb01011703160116032a16000d0ece00010d1707170616062f132b7b16000005160316012a0c0e0c140a5f5f6d61705f5f305f5f16004744cb01024a17160116000d0ece00010d1705170416042f132b7bca140a5f5f6d61705f5f305f5f160047447a7e0214696e73657274206174206d617020706174683a2000b11601a001d20102a00016012aa10005160016015f01000205004048d365b06caeb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb010117031601160332132c7b160316012b17041600000516040c2f4c0cca0d0c140a5f5f6d61705f5f305f5f160047447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16004744cb0102a00016012ba10006160016015f0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010101030019d3fe1110a1a0000c33132a7bb417011601ce011600ac160013c40de0b6b3a7640000a00000021702a00116022aa10107160116005f010300010005d3a28b71d5b417001600000500020102001916000006170116010c334c081600ce011601ab08160016015fa0010d0e0c140a5f5f6d61705f5f305f5f16004744cb010201000105014024d31191a066140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1704160401010d0d0d1604010117021701a00116022b17031601160313c40de0b6b3a76400000002021405020300030014050202000200ad188000e5b5c1174876e8000137a44447d79d999377ba4b33e0b3ca20c672a9a2112f17d90d90ee6147824c53ae4fd760000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c6b85ed630d994e8cd080000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
-      signature: "89222a8c53905b172735af31d1bb4020b4e33e3ebadf84e641c2feba28f512876a6ea700f10c986d7563da365227f1a97b91a2f003c0af0e8f57a3d1ded32dd3",
+    GovernanceDemo: {
+      txId: "9b023577c8c29ea26325571e701a805d622a8122a57ddb37b5e5f30acc6e650b",
+      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a214440d090c40e241c942404262427642b742f142ff43cd43d843e343f30100020600405ad3926b380bb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc54c403f0c0d0d140a5f5f6d61705f5f305f5f16004744cb1705160501010d0d0d1605010117041703000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012a0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012aa100160416012a0d0e0c140a5f5f6d61705f5f305f5f16004744cb01024a0bca140a5f5f6d61705f5f305f5f160047447a7e0214696e73657274206174206d617020706174683a2000b10c1601d2010201000207004060d365b06caeb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1706160601010d0d0d1606010117041703160416012b170516050d0e0c140a5f5f6d61705f5f305f5f16004744cb0102000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012b0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012ba10016050c2f4c0bca0d0c140a5f5f6d61705f5f305f5f160047447a7e021472656d6f7665206174206d617020706174683a2000cb010301000002004035d3ecf99ab7b4ce054513077b000919107b000a19117b56a101ce01ce02ce03ce041017000c170116011600314c16ca140a5f5f6d61705f5f315f5f16017a10314d0d2acf40447a7e0214696e73657274206174206d617020706174683a2000b10cd2010116010d2a17014a2605a0015e010000000012d33919f580b4ce054513077b00090f7b000a19117b56a10207a0025e010000000406d3068539face01ce02ce03ce040201000102021ad344a25325140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010116d32e30a67700090f7b140a5f5f6d61705f5f315f5f16004044cbc50e7b0c0d0d140a5f5f6d61705f5f315f5f16004044cb010102010000000103d33cfd4f9ea000020100010300405cd376a80ea2b417011601480c7b00090f7b000a19117b140a5f5f6d61705f5f315f5f16004044cbc50e7b140a5f5f6d61705f5f305f5f16014744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb01010c2f13067b0d0d0d140a5f5f6d61705f5f305f5f16014744cb01011702a00016022aa1000c0d0d140a5f5f6d61705f5f315f5f16004044cb010116022a0c0e0c140a5f5f6d61705f5f315f5f16004044cb010216000c0e0c140a5f5f6d61705f5f305f5f16014744cb01020616011600160260000000000104a0010c3002000000000104a0020c300200000000010700097a4c0318000a190214402d060300020002000200020004030000000000000000000000000000000000000000000000000000000000000000140703020002000200ad188000e7fac1174876e8000237a44447ce2506bf3088c799c1e62e582d40a760f9af1b9fb1b1317c894fa6bd7b2c340c000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b037a444473b29379622b00533436c8e3be1c87a39ef7133ce88ea9d733cb0d46cc77fa8ef0301c751b025c6835a98652ca00000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
+      signature: "debc116709ef0c7d93de77f7490059b9636055b376783951247edd8d7b608f63764fa6fefdf4e40a4ae82501009db71837ad27f5eb54a6012cc068b8d44893f1",
       gasPrice: "100000000000",
-      gasAmount: 58805,
-      blockHash: "0301c8976c0ecb0a4022b1d64ec581f5bcc3f43323c6708fd0e4fe715d146be0",
-      codeHash: "947e9fadaac74c9e777046a286e060c51e228762d1a484593aebcbd4409c8509",
+      gasAmount: 59386,
+      blockHash: "015391cf9ee9ebf0222f0b2646163a218ae97ab44589f7d26107b56509580470",
+      codeHash: "214804d168d252924a8a1a8e14570e4e26f8a09a93f8ce3848daee36038f2804",
       contractInstance: {
-        address: "26iWN6j81TzsXWp8fUFs2t9EoQvCcjtCFq9K4PMAEAAbq",
-        contractId: "b2b24a8fa27013a41afedcfc5d8603ef3c3778e385708113ddd76ad2a1cd3100",
+        address: "24HcY5Ln4Q9reT3xyhW4octmXyJzs3XTRMFAaw2dJmYE3",
+        contractId: "8e9a6039a40a48b8885da361128f6c935b934b53b4ae2b112c47c42c9d8b2200",
         groupIndex: 0
       }
     },
-    XAlphStakeVault: {
-      txId: "a0ec98e20ae70a1b70f805cdb9307695c69601eb175a44bcf56e88eac4ad1331",
-      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a214460405174028407340af40cc40fc411a41284136414f41a341c341cd41db421e423c4324441d44b8453e458d45a445bb45d4010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a62170516051602000a1702160413202a17044a2c160271a000712f02000002020110160071160171314c051600160144000b4a041601160044000b0200000101010316004f02010000000103d3b299f80ace000201000102021ad3f87904e4140a5f5f6d61705f5f305f5f16004744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010108d32b875d11140a5f5f6d61705f5f305f5f16004744cbc50201010108004061d3d63c543cb4170116014813412d7b16000c331341307b1601ce001600ac140a5f5f6d61705f5f305f5f16014744cbc54c40370c0d0d140a5f5f6d61705f5f305f5f16014744cb1707160701010d0d0d1607010117031702160216002a0c0e0c140a5f5f6d61705f5f305f5f16014744cb01021603000517040c170516051604314c0f1603160500001706160116000e0c1606d4926b380b16050d2a17054a2d4a0bca140a5f5f6d61705f5f305f5f160147447a7e0214696e73657274206174206d617020706174683a2000b116000006d20102a00116002aa10106160116005f0101010900406dd310bd129fb4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b16000c331341317b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1708160801010d0d0d1608010117031702160216003413412f7b160216002b17041603000517050c170616061605314c0f1603160600001707160116000e0c1607d465b06cae16060d2a17064a2d16040c2f4c0cca0d0c140a5f5f6d61705f5f305f5f160147447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16014744cb01021601ce001600aba00116002ba10107160116005f01000206004045d3c5f91cb4b4170216024813412d7b1601160000161341357b140a5f5f6d61705f5f305f5f16024744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16024744cb1705160501010d0d0d160501011704170316040005ce01311341327b1604160000010b241341337b160216030e0c1600d4926b380b1604160000030d0e0c140a5f5f6d61705f5f305f5f16024744cb01020100010500403ad3b6398887b4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1704160401010d0d0d16040101170317021603160000010b251341347b160116020e0c1600d465b06cae1603160000020d0e0c140a5f5f6d61705f5f305f5f16014744cb010201000101011fd3e5725392140a5f5f6d61705f5f305f5f16004744cbc5197a4b0418a0010c2f4c020c020c0d0d140a5f5f6d61705f5f305f5f16004744cb010113c40de0b6b3a76400002ca0012d02010001010008d3e5bf78dcb4a0024513412c7b16000008010001010008d34f58efe6b4a0024513412c7b1600a102010002030109d3af1ed9dd1601b9170216001602000b0009021440260203402006a72c6ce8eb96c1d40fd6c2bfbc51e522cae9ec355d9c63ff6c8a8fcd119100020214404803034020fea099302300b2e1cd13efcf93a4a421f15ba3978dd53a0e391cd2134035eadb02000400bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80aad188000ebc3c1174876e8000137a44447a67cbe36b901780ebb884d3eb0acb3cd77813f67fbc4d88a761e5ec0583d7e5e000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c6b328e8c2658537f0100000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
-      signature: "bf5e34710abec3d507483a925287205449787da0678071c7b3eddb14e7b161a40e98fccaf83602e338d21957e8e96c156d07771391ed455021c00f5f8f99414b",
+    RewardSharingVault: {
+      txId: "43742c26442904519df1eb4dd2edb516eb858d71e38ba0958519405cf586ed82",
+      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a2144360040740d04184426e42a942bb42f2435001000208004056d3926b380bb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc54c40270c0d0d140a5f5f6d61705f5f305f5f16004744cb01011703160116032a16000d0ece00010d1707170616062f132b7b16000005160316012a0c0e0c140a5f5f6d61705f5f305f5f16004744cb01024a17160116000d0ece00010d1705170416042f132b7bca140a5f5f6d61705f5f305f5f160047447a7e0214696e73657274206174206d617020706174683a2000b11601a001d20102a00016012aa10005160016015f01000205004048d365b06caeb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb010117031601160332132c7b160316012b17041600000516040c2f4c0cca0d0c140a5f5f6d61705f5f305f5f160047447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16004744cb0102a00016012ba10006160016015f0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010101030019d3fe1110a1a0000c33132a7bb417011601ce011600ac160013c40de0b6b3a7640000a00000021702a00116022aa10107160116005f010300010005d3a28b71d5b417001600000500020102001916000006170116010c334c081600ce011601ab08160016015fa0010d0e0c140a5f5f6d61705f5f305f5f16004744cb010201000105014024d31191a066140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1704160401010d0d0d1604010117021701a00116022b17031601160313c40de0b6b3a76400000002021405020300030014050202000200ad188000e5b5c1174876e8000137a444473d0d23bf7e46f60442da706b836a9b3147b4cdc35a45169745afe8df7215c078000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c751b025c50b30d76e08980000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
+      signature: "ac4dbeb528b9874e70b7d5984e446ee7e710949403588eaeb4041028facebc8a774e7e56f2a50ac58f3cb5dc9420f9ee4a8586cc9e9b54aa4818bec60b304498",
       gasPrice: "100000000000",
-      gasAmount: 60355,
-      blockHash: "02c04dac6bb586ea6428ac21cf82d502013e4017081fc4ec6ef779493039fcc0",
-      codeHash: "363b235338a6ed130bea561739876c8d5122a344aa131085b5d8ee6a8b8fd73e",
+      gasAmount: 58805,
+      blockHash: "009261b9e75ad4b046b4b238051b8598456d6d280bf3c4993abf3360d82c3b80",
+      codeHash: "947e9fadaac74c9e777046a286e060c51e228762d1a484593aebcbd4409c8509",
       contractInstance: {
-        address: "26Mp4LUrqM4uJW1zbvJwvBrGFvcjH8Sns8CbfLmM8Y23Z",
-        contractId: "ad6519c3c5b3d820f7a5104032990a78e85379d0e987d3b4880484d243cebd00",
+        address: "2ACrBx7ShFoqtT9xgw9E1s1P4hAvBzGzyBPKcLaSCkLj9",
+        contractId: "e68807ea08e12fb5e0e60252ea1c8b0f8273462a47f07694420f07d0fbe4e900",
         groupIndex: 0
       }
     },
-    GovernanceDemo: {
-      txId: "55bbbfdd126faa90658a8ea502462b763c90731621b624c5aa68ee14b3631317",
-      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a214440d090c40e241c942404262427642b742f142ff43cd43d843e343f30100020600405ad3926b380bb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc54c403f0c0d0d140a5f5f6d61705f5f305f5f16004744cb1705160501010d0d0d1605010117041703000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012a0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012aa100160416012a0d0e0c140a5f5f6d61705f5f305f5f16004744cb01024a0bca140a5f5f6d61705f5f305f5f160047447a7e0214696e73657274206174206d617020706174683a2000b10c1601d2010201000207004060d365b06caeb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1706160601010d0d0d1606010117041703160416012b170516050d0e0c140a5f5f6d61705f5f305f5f16004744cb0102000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012b0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012ba10016050c2f4c0bca0d0c140a5f5f6d61705f5f305f5f160047447a7e021472656d6f7665206174206d617020706174683a2000cb010301000002004035d3ecf99ab7b4ce054513077b000919107b000a19117b56a101ce01ce02ce03ce041017000c170116011600314c16ca140a5f5f6d61705f5f315f5f16017a10314d0d2acf40447a7e0214696e73657274206174206d617020706174683a2000b10cd2010116010d2a17014a2605a0015e010000000012d33919f580b4ce054513077b00090f7b000a19117b56a10207a0025e010000000406d3068539face01ce02ce03ce040201000102021ad344a25325140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010116d32e30a67700090f7b140a5f5f6d61705f5f315f5f16004044cbc50e7b0c0d0d140a5f5f6d61705f5f315f5f16004044cb010102010000000103d33cfd4f9ea000020100010300405cd376a80ea2b417011601480c7b00090f7b000a19117b140a5f5f6d61705f5f315f5f16004044cbc50e7b140a5f5f6d61705f5f305f5f16014744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb01010c2f13067b0d0d0d140a5f5f6d61705f5f305f5f16014744cb01011702a00016022aa1000c0d0d140a5f5f6d61705f5f315f5f16004044cb010116022a0c0e0c140a5f5f6d61705f5f315f5f16004044cb010216000c0e0c140a5f5f6d61705f5f305f5f16014744cb01020616011600160260000000000104a0010c3002000000000104a0020c300200000000010700097a4c0318000a190214402d060300020002000200020004030000000000000000000000000000000000000000000000000000000000000000140703020002000200ad188000e7fac1174876e8000137a44447629d8865f0377d63a95c83b089d78f8f36cef8794c0c63d9c8bfa4737b43163b000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c6b328ea3b1c3eef04c80000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
-      signature: "71402f7759070a743093ac7927029c09fb28c751d86015778776502fb740cf81299c12b9629a05a39f9ef52c1de3a5372969f92adc84271062c3a2a5db9cab6a",
+    XAlphStakeVault: {
+      txId: "f30de7021a11ec3004e8ebbc34a526b18d99d514257ec5a496d65f077183ce71",
+      unsignedTx: "000401010103000000081500bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a13c4016345785d8a0000a214460905174028407340af40cc40fc411a41284136414f41a341c341cd41db422342414329442244bd4543459245a945c045d9010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a62170516051602000a1702160413202a17044a2c160271a000712f02000002020110160071160171314c051600160144000b4a041601160044000b0200000101010316004f02010000000103d3b299f80ace000201000102021ed3f87904e4140a5f5f6d61705f5f305f5f16004744cbc5194c040c0006024a110c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010108d32b875d11140a5f5f6d61705f5f305f5f16004744cbc50201010108004061d3d63c543cb4170116014813412d7b16000c331341307b1601ce001600ac140a5f5f6d61705f5f305f5f16014744cbc54c40370c0d0d140a5f5f6d61705f5f305f5f16014744cb1707160701010d0d0d1607010117031702160216002a0c0e0c140a5f5f6d61705f5f305f5f16014744cb01021603000517040c170516051604314c0f1603160500001706160116000e0c1606d4926b380b16050d2a17054a2d4a0bca140a5f5f6d61705f5f305f5f160147447a7e0214696e73657274206174206d617020706174683a2000b116000006d20102a00116002aa10106160116005f0102010900406dd310bd129fb4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b16000c331341317b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1708160801010d0d0d1608010117031702160216003413412f7b160216002b17041603000517050c170616061605314c0f1603160600001707160116000e0c1607d465b06cae16060d2a17064a2d16040c2f4c0cca0d0c140a5f5f6d61705f5f305f5f160147447a7e021472656d6f7665206174206d617020706174683a2000cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16014744cb01021601ce001600aba00116002ba10107160116005f01000206004045d3c5f91cb4b4170216024813412d7b1601160000161341357b140a5f5f6d61705f5f305f5f16024744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16024744cb1705160501010d0d0d160501011704170316040005ce01311341327b1604160000010b241341337b160216030e0c1600d4926b380b1604160000030d0e0c140a5f5f6d61705f5f305f5f16024744cb01020100010500403ad3b6398887b4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1704160401010d0d0d16040101170317021603160000010b251341347b160116020e0c1600d465b06cae1603160000020d0e0c140a5f5f6d61705f5f305f5f16014744cb010201000101011fd3e5725392140a5f5f6d61705f5f305f5f16004744cbc5197a4b0418a0010c2f4c020c020c0d0d140a5f5f6d61705f5f305f5f16004744cb010113c40de0b6b3a76400002ca0012d02010001010008d3e5bf78dcb4a0024513412c7b16000008010001010008d34f58efe6b4a0024513412c7b1600a102010002030109d3af1ed9dd1601b9170216001602000b000902144026020340200bd7e14c31b8979dcdc10da8eb346d9578b2decb983d2cd0d74c888215d84900020214404803034020fea099302300b2e1cd13efcf93a4a421f15ba3978dd53a0e391cd2134035eadb02000400bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80aad188000ebcdc1174876e8000137a44447c558a45262d7b18950c98626782f2b9021e6113a13813319cf519ad495a692e5000381818e63bd9e35a5489b52a430accefc608fd60aa2c7c0d1b393b5239aedf6b001c751b025c3927934e24ed00000bee85f379545a2ed9f6cceb331288842f378cf0f04012ad4ac8824aae7d6f80a00000000000000000000",
+      signature: "d9687adafb4ef6c97ac50ec2f0d169b3c231da678ab12ed4457fb31df3c2df301a4ea882934e8ee0c5231ba25929503044e73572656e2c2d226f540991188685",
       gasPrice: "100000000000",
-      gasAmount: 59386,
-      blockHash: "0890c618cdc93a4eafa277b94a060dd5f7f0fd27fdde6515e64b6a2615b61280",
-      codeHash: "214804d168d252924a8a1a8e14570e4e26f8a09a93f8ce3848daee36038f2804",
+      gasAmount: 60365,
+      blockHash: "001a8c38a6b473430f4adff7cd713affe7f27f3d051f7273362d476a8824dea0",
+      codeHash: "9553f5647cda93c5af12f53b8bb621424e975279a4821c9583f3fb570e691ecc",
       contractInstance: {
-        address: "2463zao2CfMyco56hnwe2JGQz9feg7aDjkyfRR9CLaTPd",
-        contractId: "8ba430c66789eb7096b50e180d6c6bbb598e2ebd9d3b958fe8a85918a9741a00",
+        address: "z3ZrfZPh2h8fBaz3EFP6QzGwkSYdLZQ9swDsHXT25Zh1",
+        contractId: "4f927796d773b746f41509e74235350b30c0f4bb81f3e29e3258d13116afcb00",
         groupIndex: 0
       }
     }
@@ -21503,6 +21797,13 @@ var StakingModule = class extends ModuleBase {
       }
     });
   }
+  async cancelUnstake(vaultIndex) {
+    return this.xAlphTokenContract.transact.cancelUnstake({
+      signer: this.scope.signer,
+      args: { vaultIndex },
+      attoAlphAmount: import_web347.DUST_AMOUNT
+    });
+  }
   async stakeXAlph(amount) {
     this.ensurePositiveAmount(amount, "Stake amount");
     return this.stakeVaultContract.transact.stake({
@@ -21520,17 +21821,6 @@ var StakingModule = class extends ModuleBase {
       attoAlphAmount: import_web347.MINIMAL_CONTRACT_DEPOSIT
     });
   }
-  async stakeAndLockAlph(amount) {
-    return AlphStakeAndLock.execute({
-      signer: this.scope.signer,
-      initialFields: {
-        xAlphToken: this.xAlphTokenContract.contractId,
-        xAlphStakeVault: this.stakeVaultContract.contractId,
-        amount
-      },
-      attoAlphAmount: amount + import_web347.MINIMAL_CONTRACT_DEPOSIT
-    });
-  }
   async unlockAndStartUnstake(amount) {
     return XAlphUnlockAndStartUnstake.execute({
       signer: this.scope.signer,
@@ -21553,7 +21843,8 @@ var StakingModule = class extends ModuleBase {
     return AlphUnstakeVault.at((0, import_web347.addressFromContractId)(contractId));
   }
   async getAlphUnstakeVaultState(userAddress, vaultIndex) {
-    return this.getAlphUnstakeVault(userAddress, vaultIndex).fetchState();
+    const stakerAddress = this.getStakerAddress(userAddress);
+    return this.getAlphUnstakeVault(stakerAddress, vaultIndex).fetchState();
   }
   async connectToDapp(contractId, merkleProof) {
     return this.stakeVaultContract.transact.connectToDapp({
@@ -21570,10 +21861,7 @@ var StakingModule = class extends ModuleBase {
     });
   }
   async getUserStakeVaultInfo(address) {
-    let stakerAddress = address;
-    if ((0, import_web347.isGrouplessAddressWithoutGroupIndex)(address)) {
-      stakerAddress = `${address}:${this.stakeVaultContract.groupIndex}`;
-    }
+    const stakerAddress = this.getStakerAddress(address);
     const result = await this.stakeVaultContract.view.getUserStakingInfo({
       args: { user: stakerAddress }
     });
@@ -21583,22 +21871,26 @@ var StakingModule = class extends ModuleBase {
     };
   }
   async isUserStaking(address) {
-    const result = await this.stakeVaultContract.view.isStaking({ args: { user: address } });
+    const stakerAddress = this.getStakerAddress(address);
+    const result = await this.stakeVaultContract.view.isStaking({ args: { user: stakerAddress } });
     return result.returns;
   }
   async getUserWeight(address) {
-    const result = await this.stakeVaultContract.view.getWeight({ args: { user: address } });
+    const stakerAddress = this.getStakerAddress(address);
+    const result = await this.stakeVaultContract.view.getWeight({ args: { user: stakerAddress } });
     return result.returns;
   }
   async getActiveUnstakeVaultIndexes(address) {
+    const stakerAddress = this.getStakerAddress(address);
     const result = await this.xAlphTokenContract.view.getActiveUnstakeVaultIndexes({
-      args: { caller: address }
+      args: { caller: stakerAddress }
     });
     return decodeU256List(result.returns);
   }
   async getClaimableAmount(address, vaultIndex) {
+    const stakerAddress = this.getStakerAddress(address);
     const result = await this.xAlphTokenContract.view.getClaimableAmount({
-      args: { user: address, vaultIndex }
+      args: { user: stakerAddress, vaultIndex }
     });
     return result.returns;
   }
@@ -21633,10 +21925,16 @@ var StakingModule = class extends ModuleBase {
       throw new Error(`${label} must be greater than zero`);
     }
   }
+  getStakerAddress(address) {
+    if ((0, import_web347.isGrouplessAddressWithoutGroupIndex)(address)) {
+      return `${address}:${this.stakeVaultContract.groupIndex}`;
+    }
+    return address;
+  }
 };
 
-// src/zeta.ts
-var Zeta = class _Zeta {
+// src/powfi.ts
+var Powfi = class _Powfi {
   cpmm;
   clmm;
   token;
@@ -21665,7 +21963,7 @@ var Zeta = class _Zeta {
     this.staking = new StakingModule(this);
   }
   static load(config) {
-    return new _Zeta(config);
+    return new _Powfi(config);
   }
   set signer(signer) {
     this._signer = signer;
@@ -21741,6 +22039,8 @@ var MAX_PIPS = Pool.consts.MAX_PIPS;
   NumericUtils,
   PoolNotFoundError,
   PoolUtils,
+  Powfi,
+  PowfiSDKError,
   PriceImpactTooHighError,
   StakingContracts,
   StakingModule,
@@ -21749,8 +22049,6 @@ var MAX_PIPS = Pool.consts.MAX_PIPS;
   TokenModule,
   U256_MAX,
   UNLIMITED_AMOUNT,
-  Zeta,
-  ZetaSDKError,
   createLogger,
   decodeContractIdList,
   decodeU256List,