Fixed Scripts

-Fixed Run Functions in Sctips
-Updated README.md

Author: yug49

README.md

@@ -40,6 +40,26 @@ It is a smart contract project written in [Solidity](https://docs.soliditylang.o
     SEPOLIA_RPC_URL=<YOUR SEPOLIA RPC URL>
     ETHERSCAN_API_KEY=<YOUR ETHERSCAN API KEY>
     SEPOLIA_PRIVATE_KEY=<YOUR PRIVATE KEY>
+
+    # Arguments for Pool Deployment
+    TOKEN_A=<ADDRESS OF TOKEN A>
+    TOKEN_B=<ADDRESS OF TOKEN B>
+    FEE=<FEES IN BASIS POINTS(either 500, 3000 or 10000)>
+    INITIAL_SQRT_PRICE_X96=<INTIAL SQUARE ROOT PRICE X96>
+
+    # Arguments for Position Management
+    LOWER_TICK=-<LOWER TICK>
+    UPPER_TICK=<UPPER TICK> 
+    AMOUNT_TO_ADD=<AMOUNT OF LIQUIDITY TO ADD>
+    AMOUNT_TO_REMOVE=<AMOUNT OF LIQUIDITY TO REMOVE>
+
+    # Arguments for Collection of Fees or Removed/Burned Liquidity
+    AMOUNT0_TO_COLLECT=<AMOUNT OF TOKEN A TO COLLECT>
+    AMOUNT1_TO_COLLECT=<AMOUNT OF TOKEN B TO COLLECT>
+
+    # Arguments for Swap Management
+    SWAP_AMOUNT=<AMOUNT OF TOKENS TO SWAP>
+    SQRT_PRICE_LIMIT_X96=<SQRT PRICE LIMIT X96 WHILE SWAPPING>
 ```
 - Remove pre installed cache, unecessary or partially cloned modules modules etc.
 ```bash

script/CLAMMPoolDeployer.s.sol

@@ -17,15 +17,25 @@ contract CLAMMPoolDeployer is Script {
     mapping(address => mapping(address => mapping(uint24 => address))) public poolForPair;
 
     constructor() {
-        owner = msg.sender;
+        // vm.startBroadcast();
+        // // Set the owner to the address that deploys the contract
+        // owner = msg.sender;
+        // vm.stopBroadcast();
+
+        console.log("owner in contructor", owner);
 
         // Initialize the feeToTickSpacing mapping with values
         feeToTickSpacing[500] = 10;
         feeToTickSpacing[3000] = 60;
         feeToTickSpacing[10000] = 200;
     }
 
-    function run(address tokenA, address tokenB, uint24 fee, uint160 initialSqrtPriceX96) public returns (CLAMMPool) {
+    function run() public returns (CLAMMPool) {
+        address tokenA = vm.envAddress("TOKEN_A");
+        address tokenB = vm.envAddress("TOKEN_B");
+        uint24 fee = uint24(vm.envUint("FEE"));
+        uint160 initialSqrtPriceX96 = uint160(vm.envUint("INITIAL_SQRT_PRICE_X96"));
+
         if (tokenA == address(0) || tokenB == address(0)) {
             revert CLAMMPoolDeployer__InvalidTokenAddressEntered();
         }
@@ -35,7 +45,9 @@ contract CLAMMPoolDeployer is Script {
         if (feeToTickSpacing[fee] == 0) {
             revert CLAMMPoolDeployer__InvalidFeeEntered();
         }
-        if (msg.sender != owner) {
+        if (owner != address(0) && msg.sender != owner) {
+            console.log("msg.sender", msg.sender);
+            console.log("owner", owner);
             revert CLAMMPoolDeployer__NotOwner();
         }
         return deployCLAMMPoolContract(tokenA, tokenB, fee, initialSqrtPriceX96);
@@ -57,6 +69,7 @@ contract CLAMMPoolDeployer is Script {
         // Deploy the CLAMMPool contract
         CLAMMPool clammPool = new CLAMMPool(_tokenA, _tokenB, fee, feeToTickSpacing[fee]);
         clammPool.initialize(initialSqrtPriceX96);
+        if (owner == address(0)) owner = msg.sender;
 
         vm.stopBroadcast();
 

script/Interactions.s.sol

@@ -11,7 +11,11 @@ import {DevOpsTools} from "../lib/foundry-devops/src/DevOpsTools.sol";
  * Position Management
  */
 contract AddLiquidity is Script {
-    function run(int24 tickLower, int24 tickUpper, uint128 amount) public {
+    function run() public {
+        int24 tickLower = int24(uint24(vm.envUint("LOWER_TICK")));
+        int24 tickUpper = int24(uint24(vm.envUint("UPPER_TICK")));
+        uint128 amount = uint128(vm.envUint("AMOUNT_TO_ADD"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 
@@ -23,7 +27,11 @@ contract AddLiquidity is Script {
 }
 
 contract RemoveLiquidity is Script {
-    function run(int24 tickLower, int24 tickUpper, uint128 amount) public {
+    function run() public {
+        int24 tickLower = int24(uint24(vm.envUint("LOWER_TICK")));
+        int24 tickUpper = int24(uint24(vm.envUint("UPPER_TICK")));
+        uint128 amount = uint128(vm.envUint("AMOUNT_TO_REMOVE"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 
@@ -38,7 +46,12 @@ contract RemoveLiquidity is Script {
  * Collect Fees or Removed/Burned Liquidity
  */
 contract CollectFeesAndRemovedLiquidity is Script {
-    function run(int24 tickLower, int24 tickUpper, uint128 amount0Requested, uint128 amount1Requested) public {
+    function run() public {
+        int24 tickLower = int24(uint24(vm.envUint("LOWER_TICK")));
+        int24 tickUpper = int24(uint24(vm.envUint("UPPER_TICK")));
+        uint128 amount0Requested = uint128(vm.envUint("AMOUNT0_TO_COLLECT"));
+        uint128 amount1Requested = uint128(vm.envUint("AMOUNT1_TO_COLLECT"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 
@@ -53,7 +66,10 @@ contract CollectFeesAndRemovedLiquidity is Script {
  * Swap Management
  */
 contract SwapTokensZeroForOneExactInput is Script {
-    function run(uint256 amount, uint160 sqrtPriceLimitX96) public {
+    function run() public {
+        uint256 amount = uint256(vm.envUint("SWAP_AMOUNT"));
+        uint160 sqrtPriceLimitX96 = uint160(vm.envUint("SQRT_PRICE_LIMIT_X96"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 
@@ -65,7 +81,10 @@ contract SwapTokensZeroForOneExactInput is Script {
 }
 
 contract SwapTokensOneForZeroExactInput is Script {
-    function run(uint256 amount, uint160 sqrtPriceLimitX96) public {
+    function run() public {
+        uint256 amount = uint256(vm.envUint("SWAP_AMOUNT"));
+        uint160 sqrtPriceLimitX96 = uint160(vm.envUint("SQRT_PRICE_LIMIT_X96"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 
@@ -77,7 +96,10 @@ contract SwapTokensOneForZeroExactInput is Script {
 }
 
 contract SwapTokensZeroForOneExactOutput is Script {
-    function run(uint256 amount, uint160 sqrtPriceLimitX96) public {
+    function run() public {
+        uint256 amount = uint256(vm.envUint("SWAP_AMOUNT"));
+        uint160 sqrtPriceLimitX96 = uint160(vm.envUint("SQRT_PRICE_LIMIT_X96"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 
@@ -89,7 +111,10 @@ contract SwapTokensZeroForOneExactOutput is Script {
 }
 
 contract SwapTokensOneForZeroExactOutput is Script {
-    function run(uint256 amount, uint160 sqrtPriceLimitX96) public {
+    function run() public {
+        uint256 amount = uint256(vm.envUint("SWAP_AMOUNT"));
+        uint160 sqrtPriceLimitX96 = uint160(vm.envUint("SQRT_PRICE_LIMIT_X96"));
+
         address recentDeployment = DevOpsTools.get_most_recent_deployment("CLAMMPool", block.chainid);
         CLAMMPool clammPool = CLAMMPool(recentDeployment);
 

src/CLAMMPool.sol

@@ -173,7 +173,6 @@ contract CLAMMPool {
         lock
         returns (uint256 amount0, uint256 amount1)
     {
-        // mint logic
         if (amount <= 0) revert CLAMMPool__AmountInvalid();
         (, int256 amount0Int, int256 amount1Int) = _modifyPosition(
             ModifyPositionParams({