feat: use merkle distributor with deadline

foundry.toml

@@ -15,6 +15,7 @@ fs_permissions = [
     { access = "read", path = "./out" },
     { access = "read", path = "./data" },
     { access = "read", path = "./script/upgrades/dependencies.json" },
+    { access = "read", path = "./script/upgrades/MINIDROP/data/" },
 ]
 via_ir = true
 

script/upgrades/MINIDROP/data/alfajores.root.json

@@ -0,0 +1,4 @@
+{
+  "cUSDRoot": "0x92dfd30b2fb698891a63455cdc438dfc30e43c43251f642f39225ada6227c09d",
+  "mentoRoot": "0x92dfd30b2fb698891a63455cdc438dfc30e43c43251f642f39225ada6227c09e"
+}

script/upgrades/MINIDROP/data/celo.root.json

@@ -0,0 +1,4 @@
+{
+  "cUSDRoot": "0x92dfd30b2fb698891a63455cdc438dfc30e43c43251f642f39225ada6227c09e",
+  "mentoRoot": "0x92dfd30b2fb698891a63455cdc438dfc30e43c43251f642f39225ada6227c09e"
+}

script/upgrades/MINIDROP/deploy/MINIDROP-00-Create-MerkleDistributor.sol

@@ -18,38 +18,56 @@ contract MINIDROP_CreateMerkleDistributor is Script {
     IRegistry registry = IRegistry(0x000000000000000000000000000000000000ce10);
     address cUSD = registry.getAddressForStringOrDie("StableToken");
     address MENTO = IGovernanceFactory(contracts.deployed("GovernanceFactory")).mentoToken();
-    bytes32 merkleRootCUSD = readMerkleRoot();
-    bytes32 merkleRootMENTO = readMerkleRoot();
+
+    // 91 days after the current block timestamp roughly 3 months
+    uint256 endTime = block.timestamp + 91 days;
+
+    bytes32 merkleRootCUSD = readMerkleRoot(".cUSDRoot");
+    bytes32 merkleRootMENTO = readMerkleRoot(".mentoRoot");
 
     address cUSDDistributor;
     address mentoDistributor;
 
     vm.startBroadcast(vm.envUint("MENTO_DEPLOYER_PK"));
-
     {
-      cUSDDistributor = deployMerkleDistributor("MerkleDistributor.sol", cUSD, merkleRootCUSD);
+      cUSDDistributor = deployMerkleDistributor(
+        "out/MerkleDistributorWithDeadline.sol/MerkleDistributorWithDeadline.json",
+        cUSD,
+        merkleRootCUSD,
+        endTime
+      );
       console.log("MerkleDistributor for cUSD deployed at:", cUSDDistributor);
-      mentoDistributor = deployMerkleDistributor("MerkleDistributor.sol", MENTO, merkleRootMENTO);
+      mentoDistributor = deployMerkleDistributor(
+        "out/MerkleDistributorWithDeadline.sol/MerkleDistributorWithDeadline.json",
+        MENTO,
+        merkleRootMENTO,
+        endTime
+      );
       console.log("MerkleDistributor for MENTO deployed at:", mentoDistributor);
     }
 
     vm.stopBroadcast();
   }
 
-  function deployMerkleDistributor(string memory path, address token, bytes32 merkleRoot) private returns (address) {
-    bytes memory bytecode = abi.encodePacked(vm.getCode(path), abi.encode(token, merkleRoot));
+  function deployMerkleDistributor(
+    string memory path,
+    address token,
+    bytes32 merkleRoot,
+    uint256 endTime
+  ) private returns (address) {
+    bytes memory bytecode = abi.encodePacked(vm.getCode(path), abi.encode(token, merkleRoot, endTime));
     address deployedAddress;
     assembly {
       deployedAddress := create(0, add(bytecode, 0x20), mload(bytecode))
     }
     return deployedAddress;
   }
 
-  function readMerkleRoot() internal view returns (bytes32) {
+  function readMerkleRoot(string memory token) internal view returns (bytes32) {
     string memory network = ChainLib.rpcToken(); // celo | alfajores
     string memory root = vm.projectRoot();
-    string memory path = string(abi.encodePacked(root, "/data/test.root.json"));
+    string memory path = string(abi.encodePacked(root, "/script/upgrades/MINIDROP/data/", network, ".root.json"));
     string memory json = vm.readFile(path);
-    return stdJson.readBytes32(json, ".root");
+    return stdJson.readBytes32(json, token);
   }
 }

script/upgrades/MINIDROP/deploy/import.sol

@@ -4,4 +4,4 @@ pragma solidity 0.8.17;
 // File needed to compile 0.8.17 contract from merkle-distributor without causing
 // problems with different solidity versions.
 
-import { MerkleDistributor } from "merkle-distributor/MerkleDistributor.sol";
+import { MerkleDistributorWithDeadline } from "merkle-distributor/MerkleDistributorWithDeadline.sol";