punkkit-sdk 1.0.26 → 1.0.29

package/dist/index.d.mts

@@ -131,6 +131,16 @@ interface ModifyPositionParams {
 
 declare function addLiq(wallet: Wallet, priceLower: number, priceUpper: number, amount0: bigint | number, amount1: bigint | number, poolKey: PoolKey): Promise<ethers.providers.TransactionReceipt>;
 
+/**
+ * Removes liquidity by directly specifying exact tick ranges and the liquidity delta to remove.
+ * This is primarily used when matching with the frontend's position data.
+ */
+declare function removeLiqByPosition(wallet: Wallet, tickLower: number, tickUpper: number, liquidityToRemove: bigint | string): Promise<providers.TransactionReceipt>;
+/**
+ * Legacy support: calculate liquidity to remove via token amount projections.
+ */
+declare function removeLiq(wallet: Wallet, priceLower: number, priceUpper: number, amount0: bigint, amount1: bigint, poolKey: PoolKey): Promise<providers.TransactionReceipt>;
+
 interface UserPosition {
     tokenId: number;
     tickLower: number;
@@ -204,4 +214,4 @@ declare function balanceOf(contractAddress: string, provider: SignerOrProvider,
 declare function getAllVouchers(contractAddress: string, provider: SignerOrProvider): Promise<string[]>;
 declare function BuildUseVoucherTx(tx: providers.TransactionRequest, voucherName: string): providers.TransactionRequest;
 
-export { BuildUseVoucherTx, type ChallengeMatchResultParams, type CreateAuctionConfigParams, type CreateAuctionParams, type ModifyPositionParams, type PlaceBidParams, type PoolKey, type RevealBidParams, type RevealLockParams, type SetUnlockStrategyParams, type SignerOrProvider, type SubmitMatchResultsParams, type SwapParams, type UnlockTokensParams, type UserPosition, type WithdrawMatchResultParams, addLiq, amount0, amount1, balanceOf, buyVoucher, buyVoucherWithEth, calculateLiqDelta, calculatePriceFromTick, calculateTickFromPrice, calculateTickFromPriceWithSpacing, createAuction$1 as createAuction, createAuctionConfig, createAuction as createAuctionOnVault, createVoucher, getActiveAuctionsCount, getAllVouchers, getAuctionContract, getAuctionInfo, getAuctionLockInfo, getContract, getCurrentTick, getLiquidity, getLockInfo, getMatchResult, getPoolId, getPoolPrice, getPoolSqrtPrice, getProvider, getSqrtPriceAtTick, getUserPositions, getVoucherContract, getVoucherInfo, liquidity0, liquidity1, main, modifyPosition, mutiVoucherABI, placeBid, priceToSqrtPrice, revealBid, revealLock, submitMatchResults, swap, toWei, unlockTokens, useVoucher, withdrawMatchResult };
+export { BuildUseVoucherTx, type ChallengeMatchResultParams, type CreateAuctionConfigParams, type CreateAuctionParams, type ModifyPositionParams, type PlaceBidParams, type PoolKey, type RevealBidParams, type RevealLockParams, type SetUnlockStrategyParams, type SignerOrProvider, type SubmitMatchResultsParams, type SwapParams, type UnlockTokensParams, type UserPosition, type WithdrawMatchResultParams, addLiq, amount0, amount1, balanceOf, buyVoucher, buyVoucherWithEth, calculateLiqDelta, calculatePriceFromTick, calculateTickFromPrice, calculateTickFromPriceWithSpacing, createAuction$1 as createAuction, createAuctionConfig, createAuction as createAuctionOnVault, createVoucher, getActiveAuctionsCount, getAllVouchers, getAuctionContract, getAuctionInfo, getAuctionLockInfo, getContract, getCurrentTick, getLiquidity, getLockInfo, getMatchResult, getPoolId, getPoolPrice, getPoolSqrtPrice, getProvider, getSqrtPriceAtTick, getUserPositions, getVoucherContract, getVoucherInfo, liquidity0, liquidity1, main, modifyPosition, mutiVoucherABI, placeBid, priceToSqrtPrice, removeLiq, removeLiqByPosition, revealBid, revealLock, submitMatchResults, swap, toWei, unlockTokens, useVoucher, withdrawMatchResult };

package/dist/index.d.ts

@@ -131,6 +131,16 @@ interface ModifyPositionParams {
 
 declare function addLiq(wallet: Wallet, priceLower: number, priceUpper: number, amount0: bigint | number, amount1: bigint | number, poolKey: PoolKey): Promise<ethers.providers.TransactionReceipt>;
 
+/**
+ * Removes liquidity by directly specifying exact tick ranges and the liquidity delta to remove.
+ * This is primarily used when matching with the frontend's position data.
+ */
+declare function removeLiqByPosition(wallet: Wallet, tickLower: number, tickUpper: number, liquidityToRemove: bigint | string): Promise<providers.TransactionReceipt>;
+/**
+ * Legacy support: calculate liquidity to remove via token amount projections.
+ */
+declare function removeLiq(wallet: Wallet, priceLower: number, priceUpper: number, amount0: bigint, amount1: bigint, poolKey: PoolKey): Promise<providers.TransactionReceipt>;
+
 interface UserPosition {
     tokenId: number;
     tickLower: number;
@@ -204,4 +214,4 @@ declare function balanceOf(contractAddress: string, provider: SignerOrProvider,
 declare function getAllVouchers(contractAddress: string, provider: SignerOrProvider): Promise<string[]>;
 declare function BuildUseVoucherTx(tx: providers.TransactionRequest, voucherName: string): providers.TransactionRequest;
 
-export { BuildUseVoucherTx, type ChallengeMatchResultParams, type CreateAuctionConfigParams, type CreateAuctionParams, type ModifyPositionParams, type PlaceBidParams, type PoolKey, type RevealBidParams, type RevealLockParams, type SetUnlockStrategyParams, type SignerOrProvider, type SubmitMatchResultsParams, type SwapParams, type UnlockTokensParams, type UserPosition, type WithdrawMatchResultParams, addLiq, amount0, amount1, balanceOf, buyVoucher, buyVoucherWithEth, calculateLiqDelta, calculatePriceFromTick, calculateTickFromPrice, calculateTickFromPriceWithSpacing, createAuction$1 as createAuction, createAuctionConfig, createAuction as createAuctionOnVault, createVoucher, getActiveAuctionsCount, getAllVouchers, getAuctionContract, getAuctionInfo, getAuctionLockInfo, getContract, getCurrentTick, getLiquidity, getLockInfo, getMatchResult, getPoolId, getPoolPrice, getPoolSqrtPrice, getProvider, getSqrtPriceAtTick, getUserPositions, getVoucherContract, getVoucherInfo, liquidity0, liquidity1, main, modifyPosition, mutiVoucherABI, placeBid, priceToSqrtPrice, revealBid, revealLock, submitMatchResults, swap, toWei, unlockTokens, useVoucher, withdrawMatchResult };
+export { BuildUseVoucherTx, type ChallengeMatchResultParams, type CreateAuctionConfigParams, type CreateAuctionParams, type ModifyPositionParams, type PlaceBidParams, type PoolKey, type RevealBidParams, type RevealLockParams, type SetUnlockStrategyParams, type SignerOrProvider, type SubmitMatchResultsParams, type SwapParams, type UnlockTokensParams, type UserPosition, type WithdrawMatchResultParams, addLiq, amount0, amount1, balanceOf, buyVoucher, buyVoucherWithEth, calculateLiqDelta, calculatePriceFromTick, calculateTickFromPrice, calculateTickFromPriceWithSpacing, createAuction$1 as createAuction, createAuctionConfig, createAuction as createAuctionOnVault, createVoucher, getActiveAuctionsCount, getAllVouchers, getAuctionContract, getAuctionInfo, getAuctionLockInfo, getContract, getCurrentTick, getLiquidity, getLockInfo, getMatchResult, getPoolId, getPoolPrice, getPoolSqrtPrice, getProvider, getSqrtPriceAtTick, getUserPositions, getVoucherContract, getVoucherInfo, liquidity0, liquidity1, main, modifyPosition, mutiVoucherABI, placeBid, priceToSqrtPrice, removeLiq, removeLiqByPosition, revealBid, revealLock, submitMatchResults, swap, toWei, unlockTokens, useVoucher, withdrawMatchResult };

package/dist/index.js

@@ -31487,6 +31487,30 @@ var init_lib49 = __esm({
   }
 });
 
+// config/addresses.json
+var addresses_default;
+var init_addresses3 = __esm({
+  "config/addresses.json"() {
+    addresses_default = {
+      mutiVoucher: "0x0000000000000000000000000000000000000044",
+      auction: {
+        chainYVaultV2: "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58",
+        chainXAuctionV2: "0x88566F811b751Fa527A0816d99d6968E00f2eBef",
+        coinbase: "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58"
+      },
+      uniswap: {
+        create2: "0xc5a5C42992dECbae36851359345FE25997F5C42d",
+        token0: "0x18c714d6cc9A38DBb369a8c47A8744016F8D7055",
+        token1: "0x8B4eEeBE05048C084AB739deB29d94E8E0d07A6E",
+        poolManager: "0x4cb143D21145BcAf06D2c5557927E2939Aa0FAfe",
+        liquidPool: "0xB3AEA00D39f4dEE364D767Cd0fb7B437d415Fb9C",
+        limitOrder: "0xE8feDC742EDE9852c7F3E2c3793a2A98C1c7D040",
+        dynamicFee: "0xA0C0C10e144D34EB501A42Df0EdB5C45D40Ad040"
+      }
+    };
+  }
+});
+
 // config/env.config.ts
 function getEnvValue(key3, defaultValue) {
   const value = process.env[key3];
@@ -31534,20 +31558,20 @@ function loadConfig() {
       )
     },
     contracts: {
-      mutiVoucher: getEnvValue("MutiVoucher", "0x0000000000000000000000000000000000000044"),
+      mutiVoucher: addresses_default.mutiVoucher,
       auction: {
-        chainYVaultV2: getEnvValue("ChainYVaultV2", "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58"),
-        chainXAuctionV2: getEnvValue("ChainXAuctionV2", "0x88566F811b751Fa527A0816d99d6968E00f2eBef"),
-        coinbase: getEnvValue("Coinbase", "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58")
+        chainYVaultV2: addresses_default.auction.chainYVaultV2,
+        chainXAuctionV2: addresses_default.auction.chainXAuctionV2,
+        coinbase: addresses_default.auction.coinbase
       },
       uniswap: {
-        create2: getEnvValue("Create2", "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90"),
-        token0: getEnvValue("Token0", "0x62B771ec87108E06E32291e81D4a9ec6b75B9393"),
-        token1: getEnvValue("Token1", "0xD0Fe15DCd319b834AB34e17AE3a82e9Ec0756fD1"),
-        poolManager: getEnvValue("PoolManager", "0xf1a3B2d7c11889Ec3146392ABaDD4fac3EEbd831"),
-        liquidPool: getEnvValue("LiquidPool", "0x46eDC5824c1a323aBd886842A59B7B3BbAaC2d83"),
-        limitOrder: getEnvValue("LimitOrder", "0x9c525D6B8f2E90653DC034c8506AB7ad8FfC9040"),
-        dynamicFee: getEnvValue("DynamicFee", "0xba80244ffA7ae0662f70464043514daED0E71040")
+        create2: addresses_default.uniswap.create2,
+        token0: addresses_default.uniswap.token0,
+        token1: addresses_default.uniswap.token1,
+        poolManager: addresses_default.uniswap.poolManager,
+        liquidPool: addresses_default.uniswap.liquidPool,
+        limitOrder: addresses_default.uniswap.limitOrder,
+        dynamicFee: addresses_default.uniswap.dynamicFee
       }
     },
     abiPaths: {
@@ -31586,6 +31610,7 @@ var init_env_config = __esm({
   "config/env.config.ts"() {
     "use strict";
     init_lib49();
+    init_addresses3();
     config = loadConfig();
     RPC_URL = config.rpc.url;
     PRIVATE_KEY = config.wallet.privateKey;
@@ -36119,64 +36144,6 @@ var init_contract = __esm({
   }
 });
 
-// src/uniswap/1-marketprice/removeLiquidity.ts
-var require_removeLiquidity = __commonJS({
-  "src/uniswap/1-marketprice/removeLiquidity.ts"(exports2, module2) {
-    "use strict";
-    init_lib49();
-    init_uniswap_config();
-    init_pool();
-    init_ERC20();
-    init_liqCalculation();
-    init_contract();
-    async function removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, poolKey) {
-      const ticklow = calculateTickFromPriceWithSpacing(priceLower, poolKey.tickSpacing);
-      const tickhigh = calculateTickFromPriceWithSpacing(priceUpper, poolKey.tickSpacing);
-      const liqPool = await getContract(wallet2, "LiquidPool");
-      const sqrtCurrent = await getPoolSqrtPrice(liqPool);
-      const [liqDelta, amount0Rmv, amount1Rmv] = calculateLiqDelta(ticklow, sqrtCurrent, tickhigh, amount02, amount12);
-      console.log(`Attempting to remove liquidity ${liqDelta} to price range [${priceLower}, ${priceUpper}] with amount0[${amount0Rmv.toString()}], amount1[${amount1Rmv.toString()}]`);
-      const modifyPositionParams = {
-        tickLower: ticklow,
-        tickUpper: tickhigh,
-        liquidityDelta: liqDelta * BigInt(-1)
-      };
-      await modifyPosition(liqPool, modifyPositionParams, "0x00");
-    }
-    async function main3() {
-      const provider2 = new lib_exports3.JsonRpcProvider(RPC_URL);
-      const wallet2 = new Wallet(PRIVATE_KEY, provider2);
-      const liqPoolAddress = CONTRACT_ADDRESSES.LiquidPool;
-      const token0 = await getContract(wallet2, "Token0");
-      const token1 = await getContract(wallet2, "Token1");
-      const liqPool = await getContract(wallet2, "LiquidPool");
-      let poolPrice = await getPoolPrice(liqPool);
-      console.log(`Current price of pool ${liqPool.address} before removing liquidity is ${poolPrice}`);
-      const token0Before = await getERC20Balance(token0, wallet2.address);
-      const token1Before = await getERC20Balance(token1, wallet2.address);
-      console.log("Token0 balance before removing liquidity:", token0Before.toString());
-      console.log("Token1 balance before removing liquidity:", token1Before.toString());
-      const priceLower = 0.5;
-      const priceUpper = 1.5;
-      const amount02 = 100n;
-      const amount12 = 100n;
-      await removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, POOL_KEYS.limitOrderPoolKey);
-      poolPrice = await getPoolPrice(liqPool);
-      console.log(`Current price of pool ${liqPool.address} after removing liquidity is ${poolPrice}`);
-      const token0After = await getERC20Balance(token0, wallet2.address);
-      const token1After = await getERC20Balance(token1, wallet2.address);
-      console.log("Token0 change:", token0After - token0Before);
-      console.log("Token1 change:", token1After - token1Before);
-    }
-    if (typeof require !== "undefined" && typeof module2 !== "undefined" && require.main === module2) {
-      main3().catch((error) => {
-        console.error(error);
-        process.exit(1);
-      });
-    }
-  }
-});
-
 // src/uniswap/2-limitorder/place.ts
 var require_place = __commonJS({
   "src/uniswap/2-limitorder/place.ts"(exports2, module2) {
@@ -36237,7 +36204,7 @@ var require_place = __commonJS({
       const epoch = await placeLimitOrder(hook, poolKey, ticklow, zeroForOne, liquidity);
       return epoch;
     }
-    async function main3() {
+    async function main4() {
       const provider2 = new ethers_exports.providers.JsonRpcProvider(RPC_URL);
       const wallet2 = new ethers_exports.Wallet(PRIVATE_KEY, provider2);
       const token0 = await getContract(wallet2, "Token0");
@@ -36254,7 +36221,7 @@ var require_place = __commonJS({
       console.log("Token1 change:", token1After - token1Before);
     }
     if (typeof require !== "undefined" && typeof module2 !== "undefined" && require.main === module2) {
-      main3().catch((error) => {
+      main4().catch((error) => {
         console.error(error);
         process.exit(1);
       });
@@ -36305,6 +36272,8 @@ __export(index_exports, {
   mutiVoucherABI: () => mutiVoucherABI,
   placeBid: () => placeBid,
   priceToSqrtPrice: () => priceToSqrtPrice,
+  removeLiq: () => removeLiq,
+  removeLiqByPosition: () => removeLiqByPosition,
   revealBid: () => revealBid,
   revealLock: () => revealLock,
   submitMatchResults: () => submitMatchResults,
@@ -38699,8 +38668,77 @@ if (typeof require !== "undefined" && typeof module !== "undefined" && require.m
   });
 }
 
-// src/index.ts
-__reExport(index_exports, __toESM(require_removeLiquidity()), module.exports);
+// src/uniswap/1-marketprice/removeLiquidity.ts
+init_lib49();
+init_uniswap_config();
+init_pool();
+init_ERC20();
+init_liqCalculation();
+init_contract();
+async function removeLiqByPosition(wallet2, tickLower, tickUpper, liquidityToRemove) {
+  const liqPool = await getContract(wallet2, "LiquidPool");
+  let liqDelta = BigInt(liquidityToRemove.toString());
+  if (liqDelta === 0n) {
+    throw new Error("[SDK] Error: Cannot remove 0 liquidity. Action aborted.");
+  }
+  if (liqDelta > 0n) {
+    liqDelta = liqDelta * -1n;
+  }
+  console.log(`[SDK] Attempting to remove liquidity ${liqDelta} from ticks [${tickLower}, ${tickUpper}]`);
+  const modifyPositionParams = {
+    tickLower,
+    tickUpper,
+    liquidityDelta: liqDelta
+  };
+  const receipt = await modifyPosition(liqPool, modifyPositionParams, "0x00");
+  return receipt;
+}
+async function removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, poolKey) {
+  const ticklow = calculateTickFromPriceWithSpacing(priceLower, poolKey.tickSpacing);
+  const tickhigh = calculateTickFromPriceWithSpacing(priceUpper, poolKey.tickSpacing);
+  const liqPool = await getContract(wallet2, "LiquidPool");
+  const sqrtCurrent = await getPoolSqrtPrice(liqPool);
+  const [liqDelta, amount0Rmv, amount1Rmv] = calculateLiqDelta(ticklow, sqrtCurrent, tickhigh, amount02, amount12);
+  console.log(`Attempting to remove liquidity ${liqDelta} to price range [${priceLower}, ${priceUpper}] with amount0[${amount0Rmv.toString()}], amount1[${amount1Rmv.toString()}]`);
+  const modifyPositionParams = {
+    tickLower: ticklow,
+    tickUpper: tickhigh,
+    liquidityDelta: liqDelta * -1n
+  };
+  const receipt = await modifyPosition(liqPool, modifyPositionParams, "0x00");
+  return receipt;
+}
+async function main3() {
+  const provider2 = new lib_exports3.JsonRpcProvider(RPC_URL);
+  const wallet2 = new Wallet(PRIVATE_KEY, provider2);
+  const liqPoolAddress = CONTRACT_ADDRESSES.LiquidPool;
+  const token0 = await getContract(wallet2, "Token0");
+  const token1 = await getContract(wallet2, "Token1");
+  const liqPool = await getContract(wallet2, "LiquidPool");
+  let poolPrice = await getPoolPrice(liqPool);
+  console.log(`Current price of pool ${liqPool.address} before removing liquidity is ${poolPrice}`);
+  const token0Before = await getERC20Balance(token0, wallet2.address);
+  const token1Before = await getERC20Balance(token1, wallet2.address);
+  console.log("Token0 balance before removing liquidity:", token0Before.toString());
+  console.log("Token1 balance before removing liquidity:", token1Before.toString());
+  const priceLower = 0.5;
+  const priceUpper = 1.5;
+  const amount02 = 100n;
+  const amount12 = 100n;
+  await removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, POOL_KEYS.limitOrderPoolKey);
+  poolPrice = await getPoolPrice(liqPool);
+  console.log(`Current price of pool ${liqPool.address} after removing liquidity is ${poolPrice}`);
+  const token0After = await getERC20Balance(token0, wallet2.address);
+  const token1After = await getERC20Balance(token1, wallet2.address);
+  console.log("Token0 change:", token0After - token0Before);
+  console.log("Token1 change:", token1After - token1Before);
+}
+if (typeof require !== "undefined" && typeof module !== "undefined" && require.main === module) {
+  main3().catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}
 
 // src/uniswap/1-marketprice/getPositions.ts
 init_contract();
@@ -38719,8 +38757,8 @@ async function getUserPositions(wallet2, userAddress) {
         // liquidity is int256, keep as string to prevent JS precision loss
         liquidity: pos.liquidity.toString()
       };
-    });
-    console.log(`[SDK] Found ${formattedPositions.length} position(s).`);
+    }).filter((pos) => pos.liquidity !== "0");
+    console.log(`[SDK] Found ${formattedPositions.length} active position(s).`);
     return formattedPositions;
   } catch (error) {
     console.error(`[SDK] Failed to fetch user positions: `, error);
@@ -39033,6 +39071,8 @@ function BuildUseVoucherTx(tx, voucherName) {
   mutiVoucherABI,
   placeBid,
   priceToSqrtPrice,
+  removeLiq,
+  removeLiqByPosition,
   revealBid,
   revealLock,
   submitMatchResults,

package/dist/index.mjs

@@ -31491,6 +31491,30 @@ var init_lib49 = __esm({
   }
 });
 
+// config/addresses.json
+var addresses_default;
+var init_addresses3 = __esm({
+  "config/addresses.json"() {
+    addresses_default = {
+      mutiVoucher: "0x0000000000000000000000000000000000000044",
+      auction: {
+        chainYVaultV2: "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58",
+        chainXAuctionV2: "0x88566F811b751Fa527A0816d99d6968E00f2eBef",
+        coinbase: "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58"
+      },
+      uniswap: {
+        create2: "0xc5a5C42992dECbae36851359345FE25997F5C42d",
+        token0: "0x18c714d6cc9A38DBb369a8c47A8744016F8D7055",
+        token1: "0x8B4eEeBE05048C084AB739deB29d94E8E0d07A6E",
+        poolManager: "0x4cb143D21145BcAf06D2c5557927E2939Aa0FAfe",
+        liquidPool: "0xB3AEA00D39f4dEE364D767Cd0fb7B437d415Fb9C",
+        limitOrder: "0xE8feDC742EDE9852c7F3E2c3793a2A98C1c7D040",
+        dynamicFee: "0xA0C0C10e144D34EB501A42Df0EdB5C45D40Ad040"
+      }
+    };
+  }
+});
+
 // config/env.config.ts
 function getEnvValue(key3, defaultValue) {
   const value = process.env[key3];
@@ -31538,20 +31562,20 @@ function loadConfig() {
       )
     },
     contracts: {
-      mutiVoucher: getEnvValue("MutiVoucher", "0x0000000000000000000000000000000000000044"),
+      mutiVoucher: addresses_default.mutiVoucher,
       auction: {
-        chainYVaultV2: getEnvValue("ChainYVaultV2", "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58"),
-        chainXAuctionV2: getEnvValue("ChainXAuctionV2", "0x88566F811b751Fa527A0816d99d6968E00f2eBef"),
-        coinbase: getEnvValue("Coinbase", "0xAa9e62EB6d74d66Ff6720D1A8143c8237067Ff58")
+        chainYVaultV2: addresses_default.auction.chainYVaultV2,
+        chainXAuctionV2: addresses_default.auction.chainXAuctionV2,
+        coinbase: addresses_default.auction.coinbase
       },
       uniswap: {
-        create2: getEnvValue("Create2", "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90"),
-        token0: getEnvValue("Token0", "0x62B771ec87108E06E32291e81D4a9ec6b75B9393"),
-        token1: getEnvValue("Token1", "0xD0Fe15DCd319b834AB34e17AE3a82e9Ec0756fD1"),
-        poolManager: getEnvValue("PoolManager", "0xf1a3B2d7c11889Ec3146392ABaDD4fac3EEbd831"),
-        liquidPool: getEnvValue("LiquidPool", "0x46eDC5824c1a323aBd886842A59B7B3BbAaC2d83"),
-        limitOrder: getEnvValue("LimitOrder", "0x9c525D6B8f2E90653DC034c8506AB7ad8FfC9040"),
-        dynamicFee: getEnvValue("DynamicFee", "0xba80244ffA7ae0662f70464043514daED0E71040")
+        create2: addresses_default.uniswap.create2,
+        token0: addresses_default.uniswap.token0,
+        token1: addresses_default.uniswap.token1,
+        poolManager: addresses_default.uniswap.poolManager,
+        liquidPool: addresses_default.uniswap.liquidPool,
+        limitOrder: addresses_default.uniswap.limitOrder,
+        dynamicFee: addresses_default.uniswap.dynamicFee
       }
     },
     abiPaths: {
@@ -31590,6 +31614,7 @@ var init_env_config = __esm({
   "config/env.config.ts"() {
     "use strict";
     init_lib49();
+    init_addresses3();
     config = loadConfig();
     RPC_URL = config.rpc.url;
     PRIVATE_KEY = config.wallet.privateKey;
@@ -36123,64 +36148,6 @@ var init_contract = __esm({
   }
 });
 
-// src/uniswap/1-marketprice/removeLiquidity.ts
-var require_removeLiquidity = __commonJS({
-  "src/uniswap/1-marketprice/removeLiquidity.ts"(exports, module2) {
-    "use strict";
-    init_lib49();
-    init_uniswap_config();
-    init_pool();
-    init_ERC20();
-    init_liqCalculation();
-    init_contract();
-    async function removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, poolKey) {
-      const ticklow = calculateTickFromPriceWithSpacing(priceLower, poolKey.tickSpacing);
-      const tickhigh = calculateTickFromPriceWithSpacing(priceUpper, poolKey.tickSpacing);
-      const liqPool = await getContract(wallet2, "LiquidPool");
-      const sqrtCurrent = await getPoolSqrtPrice(liqPool);
-      const [liqDelta, amount0Rmv, amount1Rmv] = calculateLiqDelta(ticklow, sqrtCurrent, tickhigh, amount02, amount12);
-      console.log(`Attempting to remove liquidity ${liqDelta} to price range [${priceLower}, ${priceUpper}] with amount0[${amount0Rmv.toString()}], amount1[${amount1Rmv.toString()}]`);
-      const modifyPositionParams = {
-        tickLower: ticklow,
-        tickUpper: tickhigh,
-        liquidityDelta: liqDelta * BigInt(-1)
-      };
-      await modifyPosition(liqPool, modifyPositionParams, "0x00");
-    }
-    async function main3() {
-      const provider2 = new lib_exports3.JsonRpcProvider(RPC_URL);
-      const wallet2 = new Wallet(PRIVATE_KEY, provider2);
-      const liqPoolAddress = CONTRACT_ADDRESSES.LiquidPool;
-      const token0 = await getContract(wallet2, "Token0");
-      const token1 = await getContract(wallet2, "Token1");
-      const liqPool = await getContract(wallet2, "LiquidPool");
-      let poolPrice = await getPoolPrice(liqPool);
-      console.log(`Current price of pool ${liqPool.address} before removing liquidity is ${poolPrice}`);
-      const token0Before = await getERC20Balance(token0, wallet2.address);
-      const token1Before = await getERC20Balance(token1, wallet2.address);
-      console.log("Token0 balance before removing liquidity:", token0Before.toString());
-      console.log("Token1 balance before removing liquidity:", token1Before.toString());
-      const priceLower = 0.5;
-      const priceUpper = 1.5;
-      const amount02 = 100n;
-      const amount12 = 100n;
-      await removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, POOL_KEYS.limitOrderPoolKey);
-      poolPrice = await getPoolPrice(liqPool);
-      console.log(`Current price of pool ${liqPool.address} after removing liquidity is ${poolPrice}`);
-      const token0After = await getERC20Balance(token0, wallet2.address);
-      const token1After = await getERC20Balance(token1, wallet2.address);
-      console.log("Token0 change:", token0After - token0Before);
-      console.log("Token1 change:", token1After - token1Before);
-    }
-    if (typeof __require !== "undefined" && typeof module2 !== "undefined" && __require.main === module2) {
-      main3().catch((error) => {
-        console.error(error);
-        process.exit(1);
-      });
-    }
-  }
-});
-
 // src/uniswap/2-limitorder/place.ts
 var require_place = __commonJS({
   "src/uniswap/2-limitorder/place.ts"(exports, module2) {
@@ -36241,7 +36208,7 @@ var require_place = __commonJS({
       const epoch = await placeLimitOrder(hook, poolKey, ticklow, zeroForOne, liquidity);
       return epoch;
     }
-    async function main3() {
+    async function main4() {
       const provider2 = new ethers_exports.providers.JsonRpcProvider(RPC_URL);
       const wallet2 = new ethers_exports.Wallet(PRIVATE_KEY, provider2);
       const token0 = await getContract(wallet2, "Token0");
@@ -36258,7 +36225,7 @@ var require_place = __commonJS({
       console.log("Token1 change:", token1After - token1Before);
     }
     if (typeof __require !== "undefined" && typeof module2 !== "undefined" && __require.main === module2) {
-      main3().catch((error) => {
+      main4().catch((error) => {
         console.error(error);
         process.exit(1);
       });
@@ -36309,6 +36276,8 @@ __export(index_exports, {
   mutiVoucherABI: () => mutiVoucherABI,
   placeBid: () => placeBid,
   priceToSqrtPrice: () => priceToSqrtPrice,
+  removeLiq: () => removeLiq,
+  removeLiqByPosition: () => removeLiqByPosition,
   revealBid: () => revealBid,
   revealLock: () => revealLock,
   submitMatchResults: () => submitMatchResults,
@@ -38702,8 +38671,77 @@ if (typeof __require !== "undefined" && typeof module !== "undefined" && __requi
   });
 }
 
-// src/index.ts
-__reExport(index_exports, __toESM(require_removeLiquidity()));
+// src/uniswap/1-marketprice/removeLiquidity.ts
+init_lib49();
+init_uniswap_config();
+init_pool();
+init_ERC20();
+init_liqCalculation();
+init_contract();
+async function removeLiqByPosition(wallet2, tickLower, tickUpper, liquidityToRemove) {
+  const liqPool = await getContract(wallet2, "LiquidPool");
+  let liqDelta = BigInt(liquidityToRemove.toString());
+  if (liqDelta === 0n) {
+    throw new Error("[SDK] Error: Cannot remove 0 liquidity. Action aborted.");
+  }
+  if (liqDelta > 0n) {
+    liqDelta = liqDelta * -1n;
+  }
+  console.log(`[SDK] Attempting to remove liquidity ${liqDelta} from ticks [${tickLower}, ${tickUpper}]`);
+  const modifyPositionParams = {
+    tickLower,
+    tickUpper,
+    liquidityDelta: liqDelta
+  };
+  const receipt = await modifyPosition(liqPool, modifyPositionParams, "0x00");
+  return receipt;
+}
+async function removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, poolKey) {
+  const ticklow = calculateTickFromPriceWithSpacing(priceLower, poolKey.tickSpacing);
+  const tickhigh = calculateTickFromPriceWithSpacing(priceUpper, poolKey.tickSpacing);
+  const liqPool = await getContract(wallet2, "LiquidPool");
+  const sqrtCurrent = await getPoolSqrtPrice(liqPool);
+  const [liqDelta, amount0Rmv, amount1Rmv] = calculateLiqDelta(ticklow, sqrtCurrent, tickhigh, amount02, amount12);
+  console.log(`Attempting to remove liquidity ${liqDelta} to price range [${priceLower}, ${priceUpper}] with amount0[${amount0Rmv.toString()}], amount1[${amount1Rmv.toString()}]`);
+  const modifyPositionParams = {
+    tickLower: ticklow,
+    tickUpper: tickhigh,
+    liquidityDelta: liqDelta * -1n
+  };
+  const receipt = await modifyPosition(liqPool, modifyPositionParams, "0x00");
+  return receipt;
+}
+async function main3() {
+  const provider2 = new lib_exports3.JsonRpcProvider(RPC_URL);
+  const wallet2 = new Wallet(PRIVATE_KEY, provider2);
+  const liqPoolAddress = CONTRACT_ADDRESSES.LiquidPool;
+  const token0 = await getContract(wallet2, "Token0");
+  const token1 = await getContract(wallet2, "Token1");
+  const liqPool = await getContract(wallet2, "LiquidPool");
+  let poolPrice = await getPoolPrice(liqPool);
+  console.log(`Current price of pool ${liqPool.address} before removing liquidity is ${poolPrice}`);
+  const token0Before = await getERC20Balance(token0, wallet2.address);
+  const token1Before = await getERC20Balance(token1, wallet2.address);
+  console.log("Token0 balance before removing liquidity:", token0Before.toString());
+  console.log("Token1 balance before removing liquidity:", token1Before.toString());
+  const priceLower = 0.5;
+  const priceUpper = 1.5;
+  const amount02 = 100n;
+  const amount12 = 100n;
+  await removeLiq(wallet2, priceLower, priceUpper, amount02, amount12, POOL_KEYS.limitOrderPoolKey);
+  poolPrice = await getPoolPrice(liqPool);
+  console.log(`Current price of pool ${liqPool.address} after removing liquidity is ${poolPrice}`);
+  const token0After = await getERC20Balance(token0, wallet2.address);
+  const token1After = await getERC20Balance(token1, wallet2.address);
+  console.log("Token0 change:", token0After - token0Before);
+  console.log("Token1 change:", token1After - token1Before);
+}
+if (typeof __require !== "undefined" && typeof module !== "undefined" && __require.main === module) {
+  main3().catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}
 
 // src/uniswap/1-marketprice/getPositions.ts
 init_contract();
@@ -38722,8 +38760,8 @@ async function getUserPositions(wallet2, userAddress) {
         // liquidity is int256, keep as string to prevent JS precision loss
         liquidity: pos.liquidity.toString()
       };
-    });
-    console.log(`[SDK] Found ${formattedPositions.length} position(s).`);
+    }).filter((pos) => pos.liquidity !== "0");
+    console.log(`[SDK] Found ${formattedPositions.length} active position(s).`);
     return formattedPositions;
   } catch (error) {
     console.error(`[SDK] Failed to fetch user positions: `, error);
@@ -39035,6 +39073,8 @@ export {
   mutiVoucherABI,
   placeBid,
   priceToSqrtPrice,
+  removeLiq,
+  removeLiqByPosition,
   revealBid,
   revealLock,
   submitMatchResults,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "punkkit-sdk",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "1.0.2",
     "@nomicfoundation/hardhat-network-helpers": "^1.1.2",