punkkit-sdk 1.0.24 → 1.0.26

package/dist/index.js

@@ -36119,6 +36119,64 @@ 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) {
@@ -38582,13 +38640,6 @@ async function addLiq(wallet2, priceLower, priceUpper, amount02, amount12, poolK
   const liqPool = await getContract(wallet2, "LiquidPool");
   const amount0Big = BigInt(amount02);
   const amount1Big = BigInt(amount12);
-  console.log(`[SDK] Validating network and wallet...`);
-  if (wallet2.provider) {
-    const net = await wallet2.provider.getNetwork();
-    console.log(`[SDK] Wallet connected to chainId: ${net.chainId}`);
-  } else {
-    console.warn(`[SDK] Wallet has no provider attached!`);
-  }
   const ticklow = calculateTickFromPriceWithSpacing(priceLower, poolKey.tickSpacing);
   const tickhigh = calculateTickFromPriceWithSpacing(priceUpper, poolKey.tickSpacing);
   let sqrtCurrent;
@@ -38648,6 +38699,9 @@ if (typeof require !== "undefined" && typeof module !== "undefined" && require.m
   });
 }
 
+// src/index.ts
+__reExport(index_exports, __toESM(require_removeLiquidity()), module.exports);
+
 // src/uniswap/1-marketprice/getPositions.ts
 init_contract();
 async function getUserPositions(wallet2, userAddress) {
@@ -38678,140 +38732,6 @@ async function getUserPositions(wallet2, userAddress) {
 init_lib49();
 var provider = new ethers_exports.providers.JsonRpcProvider("http://localhost:8545");
 var wallet = new ethers_exports.Wallet("0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80", provider);
-async function isdepolyed(address) {
-  let code = await provider.getCode(address);
-  if (code !== "0x") {
-    console.log(`The contract ${address} has been deployed.`);
-  } else {
-    console.log(`The contract ${address} has not been deployed. `);
-  }
-}
-async function modifyPosition2(contract, poolKey, modifyPositionParams) {
-  let tx = await contract.setPositionParameters(poolKey, modifyPositionParams);
-  await tx.wait();
-  console.log("Position parameters set successfully");
-  tx = await contract.addLiquidity();
-  await tx.wait();
-}
-async function initialize(contract, key3, sqrtPriceX96) {
-  let tick = await contract.initialize(key3, sqrtPriceX96);
-  console.log(`Returned tick: ${JSON.stringify(tick)}`);
-}
-async function approveERC202(contract, toAddress, amount) {
-  let tx = await contract.approve(toAddress, amount);
-  let receipt = await tx.wait();
-  console.log(`Transaction hash: ${receipt.transactionHash}`);
-}
-async function getERC20Balance2(contract, address) {
-  let balance = await contract.balanceOf(address);
-  console.log(`ERC20 Balance: ${balance.toString()}`);
-  return balance;
-}
-async function executeSwap2(contract, poolKey, swapParams) {
-  console.log("begin swap");
-  let to0params = {
-    tickLower: 84e4,
-    // lower price 0.5
-    tickUpper: 876600,
-    // upper price 1.5
-    liquidityDelta: 0
-  };
-  let tx1 = await contract.setPositionParameters(poolKey, to0params);
-  await tx1.wait();
-  let tx2 = await contract.setSwapParameters(poolKey, swapParams);
-  console.log("begin swap1");
-  await tx2.wait();
-  console.log("Position parameters set successfully");
-  let tx3 = await contract.executeSwap();
-  await tx3.wait();
-}
-async function depolyContract(contractName, params) {
-  const Factory = await ethers_exports.getContractFactory(contractName);
-  let contract;
-  if (params === void 0) {
-    contract = await Factory.deploy();
-  } else {
-    console.log(`params: ${JSON.stringify(params)}`);
-    contract = await Factory.deploy(params);
-  }
-  await contract.deployed();
-  console.log(`${contractName} deployed to ${contract.address}`);
-  return contract;
-}
-describe("PoolManager", function() {
-  it("Should return the new greeting once it's changed", async function() {
-    const token0 = await depolyContract("Token0");
-    const token1 = await depolyContract("Token1");
-    const totalSupply0 = await token0.totalSupply();
-    console.log(`Token0 deployed to ${token0.address} with an initial supply ${totalSupply0}`);
-    const totalSupply1 = await token1.totalSupply();
-    console.log(`Token1 deployed to ${token1.address} with an initial supply ${totalSupply1}`);
-    getERC20Balance2(token0, wallet.address);
-    getERC20Balance2(token1, wallet.address);
-    const token0Address = token0.address < token1.address ? token0.address : token1.address;
-    const token1Address = token0.address > token1.address ? token0.address : token1.address;
-    const poolManager = await depolyContract("PoolManager", 88888888888);
-    const poolManagerAddress = poolManager.address;
-    await isdepolyed(poolManagerAddress);
-    const dynamicFee = await depolyContract("DynamicFee", poolManagerAddress);
-    console.log("LimitOrder Contract deployed to:", dynamicFee.address);
-    let sqrtPriceX96 = BigInt("792281625142643375935439503360");
-    const DYNAMIC_FEE_FLAG2 = 8388608;
-    let poolKey = {
-      currency0: token0Address,
-      currency1: token1Address,
-      fee: DYNAMIC_FEE_FLAG2,
-      tickSpacing: 60,
-      hooks: dynamicFee.address
-    };
-    await initialize(poolManager, poolKey, sqrtPriceX96);
-    const MyLiquidityProvider = await depolyContract("MyLiquidityProvider", poolManagerAddress);
-    const wei = ethers_exports.utils.parseUnits("21000000", 18).toBigInt();
-    await approveERC202(token0, MyLiquidityProvider.address, wei);
-    await approveERC202(token1, MyLiquidityProvider.address, wei);
-    let modifyPositionParams = {
-      tickLower: 45e3,
-      // lower price 90
-      tickUpper: 46980,
-      // upper price 110
-      //liquidityDelta: 194868329805051412324060
-      liquidityDelta: BigInt("10000000000000000000000")
-      // 10000token0 10000token1
-    };
-    await getERC20Balance2(token0, wallet.address);
-    await getERC20Balance2(token1, wallet.address);
-    await modifyPosition2(MyLiquidityProvider, poolKey, modifyPositionParams);
-    console.log("Liquidity added successfully");
-    await getERC20Balance2(token0, wallet.address);
-    await getERC20Balance2(token1, wallet.address);
-    let sqrtpricelimit = ethers_exports.BigNumber.from("7922816251426433759354395033600").toBigInt();
-    let amountswap = ethers_exports.BigNumber.from("1083456789101112134000").toBigInt();
-    console.log("amountswap:", amountswap.toString());
-    let swapParams = {
-      zeroForOne: false,
-      amountSpecified: amountswap,
-      sqrtPriceLimitX96: sqrtpricelimit
-    };
-    let token0beforswap = await getERC20Balance2(token0, wallet.address);
-    let token1beforswap = await getERC20Balance2(token1, wallet.address);
-    await executeSwap2(MyLiquidityProvider, poolKey, swapParams);
-    console.log("swap successfully");
-    let token0afterswap = await getERC20Balance2(token0, wallet.address);
-    let token1afterswap = await getERC20Balance2(token1, wallet.address);
-    console.log("token0 change:", token0afterswap.sub(token0beforswap).toString());
-    console.log("token1 change:", token1afterswap.sub(token1beforswap).toString());
-    console.log("price:", token1afterswap.sub(token1beforswap).toString() / token0afterswap.sub(token0beforswap).toString());
-    token0beforswap = await getERC20Balance2(token0, wallet.address);
-    token1beforswap = await getERC20Balance2(token1, wallet.address);
-    await executeSwap2(MyLiquidityProvider, poolKey, swapParams);
-    console.log("swap successfully");
-    token0afterswap = await getERC20Balance2(token0, wallet.address);
-    token1afterswap = await getERC20Balance2(token1, wallet.address);
-    console.log("token0 change:", token0afterswap.sub(token0beforswap).toString());
-    console.log("token1 change:", token1afterswap.sub(token1beforswap).toString());
-    console.log("price:", token1afterswap.sub(token1beforswap).toString() / token0afterswap.sub(token0beforswap).toString());
-  });
-});
 
 // src/index.ts
 __reExport(index_exports, __toESM(require_place()), module.exports);

package/dist/index.mjs

@@ -36123,6 +36123,64 @@ 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) {
@@ -38585,13 +38643,6 @@ async function addLiq(wallet2, priceLower, priceUpper, amount02, amount12, poolK
   const liqPool = await getContract(wallet2, "LiquidPool");
   const amount0Big = BigInt(amount02);
   const amount1Big = BigInt(amount12);
-  console.log(`[SDK] Validating network and wallet...`);
-  if (wallet2.provider) {
-    const net = await wallet2.provider.getNetwork();
-    console.log(`[SDK] Wallet connected to chainId: ${net.chainId}`);
-  } else {
-    console.warn(`[SDK] Wallet has no provider attached!`);
-  }
   const ticklow = calculateTickFromPriceWithSpacing(priceLower, poolKey.tickSpacing);
   const tickhigh = calculateTickFromPriceWithSpacing(priceUpper, poolKey.tickSpacing);
   let sqrtCurrent;
@@ -38651,6 +38702,9 @@ if (typeof __require !== "undefined" && typeof module !== "undefined" && __requi
   });
 }
 
+// src/index.ts
+__reExport(index_exports, __toESM(require_removeLiquidity()));
+
 // src/uniswap/1-marketprice/getPositions.ts
 init_contract();
 async function getUserPositions(wallet2, userAddress) {
@@ -38681,140 +38735,6 @@ async function getUserPositions(wallet2, userAddress) {
 init_lib49();
 var provider = new ethers_exports.providers.JsonRpcProvider("http://localhost:8545");
 var wallet = new ethers_exports.Wallet("0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80", provider);
-async function isdepolyed(address) {
-  let code = await provider.getCode(address);
-  if (code !== "0x") {
-    console.log(`The contract ${address} has been deployed.`);
-  } else {
-    console.log(`The contract ${address} has not been deployed. `);
-  }
-}
-async function modifyPosition2(contract, poolKey, modifyPositionParams) {
-  let tx = await contract.setPositionParameters(poolKey, modifyPositionParams);
-  await tx.wait();
-  console.log("Position parameters set successfully");
-  tx = await contract.addLiquidity();
-  await tx.wait();
-}
-async function initialize(contract, key3, sqrtPriceX96) {
-  let tick = await contract.initialize(key3, sqrtPriceX96);
-  console.log(`Returned tick: ${JSON.stringify(tick)}`);
-}
-async function approveERC202(contract, toAddress, amount) {
-  let tx = await contract.approve(toAddress, amount);
-  let receipt = await tx.wait();
-  console.log(`Transaction hash: ${receipt.transactionHash}`);
-}
-async function getERC20Balance2(contract, address) {
-  let balance = await contract.balanceOf(address);
-  console.log(`ERC20 Balance: ${balance.toString()}`);
-  return balance;
-}
-async function executeSwap2(contract, poolKey, swapParams) {
-  console.log("begin swap");
-  let to0params = {
-    tickLower: 84e4,
-    // lower price 0.5
-    tickUpper: 876600,
-    // upper price 1.5
-    liquidityDelta: 0
-  };
-  let tx1 = await contract.setPositionParameters(poolKey, to0params);
-  await tx1.wait();
-  let tx2 = await contract.setSwapParameters(poolKey, swapParams);
-  console.log("begin swap1");
-  await tx2.wait();
-  console.log("Position parameters set successfully");
-  let tx3 = await contract.executeSwap();
-  await tx3.wait();
-}
-async function depolyContract(contractName, params) {
-  const Factory = await ethers_exports.getContractFactory(contractName);
-  let contract;
-  if (params === void 0) {
-    contract = await Factory.deploy();
-  } else {
-    console.log(`params: ${JSON.stringify(params)}`);
-    contract = await Factory.deploy(params);
-  }
-  await contract.deployed();
-  console.log(`${contractName} deployed to ${contract.address}`);
-  return contract;
-}
-describe("PoolManager", function() {
-  it("Should return the new greeting once it's changed", async function() {
-    const token0 = await depolyContract("Token0");
-    const token1 = await depolyContract("Token1");
-    const totalSupply0 = await token0.totalSupply();
-    console.log(`Token0 deployed to ${token0.address} with an initial supply ${totalSupply0}`);
-    const totalSupply1 = await token1.totalSupply();
-    console.log(`Token1 deployed to ${token1.address} with an initial supply ${totalSupply1}`);
-    getERC20Balance2(token0, wallet.address);
-    getERC20Balance2(token1, wallet.address);
-    const token0Address = token0.address < token1.address ? token0.address : token1.address;
-    const token1Address = token0.address > token1.address ? token0.address : token1.address;
-    const poolManager = await depolyContract("PoolManager", 88888888888);
-    const poolManagerAddress = poolManager.address;
-    await isdepolyed(poolManagerAddress);
-    const dynamicFee = await depolyContract("DynamicFee", poolManagerAddress);
-    console.log("LimitOrder Contract deployed to:", dynamicFee.address);
-    let sqrtPriceX96 = BigInt("792281625142643375935439503360");
-    const DYNAMIC_FEE_FLAG2 = 8388608;
-    let poolKey = {
-      currency0: token0Address,
-      currency1: token1Address,
-      fee: DYNAMIC_FEE_FLAG2,
-      tickSpacing: 60,
-      hooks: dynamicFee.address
-    };
-    await initialize(poolManager, poolKey, sqrtPriceX96);
-    const MyLiquidityProvider = await depolyContract("MyLiquidityProvider", poolManagerAddress);
-    const wei = ethers_exports.utils.parseUnits("21000000", 18).toBigInt();
-    await approveERC202(token0, MyLiquidityProvider.address, wei);
-    await approveERC202(token1, MyLiquidityProvider.address, wei);
-    let modifyPositionParams = {
-      tickLower: 45e3,
-      // lower price 90
-      tickUpper: 46980,
-      // upper price 110
-      //liquidityDelta: 194868329805051412324060
-      liquidityDelta: BigInt("10000000000000000000000")
-      // 10000token0 10000token1
-    };
-    await getERC20Balance2(token0, wallet.address);
-    await getERC20Balance2(token1, wallet.address);
-    await modifyPosition2(MyLiquidityProvider, poolKey, modifyPositionParams);
-    console.log("Liquidity added successfully");
-    await getERC20Balance2(token0, wallet.address);
-    await getERC20Balance2(token1, wallet.address);
-    let sqrtpricelimit = ethers_exports.BigNumber.from("7922816251426433759354395033600").toBigInt();
-    let amountswap = ethers_exports.BigNumber.from("1083456789101112134000").toBigInt();
-    console.log("amountswap:", amountswap.toString());
-    let swapParams = {
-      zeroForOne: false,
-      amountSpecified: amountswap,
-      sqrtPriceLimitX96: sqrtpricelimit
-    };
-    let token0beforswap = await getERC20Balance2(token0, wallet.address);
-    let token1beforswap = await getERC20Balance2(token1, wallet.address);
-    await executeSwap2(MyLiquidityProvider, poolKey, swapParams);
-    console.log("swap successfully");
-    let token0afterswap = await getERC20Balance2(token0, wallet.address);
-    let token1afterswap = await getERC20Balance2(token1, wallet.address);
-    console.log("token0 change:", token0afterswap.sub(token0beforswap).toString());
-    console.log("token1 change:", token1afterswap.sub(token1beforswap).toString());
-    console.log("price:", token1afterswap.sub(token1beforswap).toString() / token0afterswap.sub(token0beforswap).toString());
-    token0beforswap = await getERC20Balance2(token0, wallet.address);
-    token1beforswap = await getERC20Balance2(token1, wallet.address);
-    await executeSwap2(MyLiquidityProvider, poolKey, swapParams);
-    console.log("swap successfully");
-    token0afterswap = await getERC20Balance2(token0, wallet.address);
-    token1afterswap = await getERC20Balance2(token1, wallet.address);
-    console.log("token0 change:", token0afterswap.sub(token0beforswap).toString());
-    console.log("token1 change:", token1afterswap.sub(token1beforswap).toString());
-    console.log("price:", token1afterswap.sub(token1beforswap).toString() / token0afterswap.sub(token0beforswap).toString());
-  });
-});
 
 // src/index.ts
 __reExport(index_exports, __toESM(require_place()));

package/package.json

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