Merge pull request #94 from gnosisguild/mock-deploy

Deploy mocks, working committee requesting

packages/evm/.gitignore

@@ -9,6 +9,7 @@ coverage
 dist
 node_modules
 types
+deployments/localhost
 
 # files
 *.env

packages/evm/contracts/registry/NaiveRegistryFilter.sol

@@ -73,9 +73,8 @@ contract NaiveRegistryFilter is IRegistryFilter, OwnableUpgradeable {
         uint256 e3Id,
         uint32[2] calldata threshold
     ) external onlyRegistry returns (bool success) {
-        Committee storage committee = committees[e3Id];
-        require(committee.threshold.length == 0, CommitteeAlreadyExists());
-        committee.threshold = threshold;
+        require(committees[e3Id].threshold[1] == 0, CommitteeAlreadyExists());
+        committees[e3Id].threshold = threshold;
         success = true;
     }
 

packages/evm/deploy/deploy.ts → packages/evm/deploy/enclave.ts

@@ -94,5 +94,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Enclave contract updated with registry`);
 };
 export default func;
-func.id = "deploy_enclave"; // id required to prevent reexecution
-func.tags = ["Enclave"];
+func.tags = ["enclave"];

packages/evm/deploy/mocks.ts

@@ -0,0 +1,33 @@
+import { DeployFunction } from "hardhat-deploy/types";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployer } = await hre.getNamedAccounts();
+  const { deploy } = hre.deployments;
+
+  await deploy("MockE3Program", {
+    from: deployer,
+    args: [],
+    log: true,
+  });
+
+  await deploy("MockComputeProvider", {
+    from: deployer,
+    args: [],
+    log: true,
+  });
+
+  await deploy("MockDecryptionVerifier", {
+    from: deployer,
+    args: [],
+    log: true,
+  });
+
+  await deploy("MockInputValidator", {
+    from: deployer,
+    args: [],
+    log: true,
+  });
+};
+export default func;
+func.tags = ["mocks"];

packages/evm/package.json

@@ -72,7 +72,8 @@
     "clean": "rimraf ./artifacts ./cache ./coverage ./types ./coverage.json && yarn typechain",
     "compile": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
     "coverage": "hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && yarn typechain",
-    "deploy": "hardhat deploy",
+    "deploy": "hardhat deploy --tags enclave",
+    "deploy:mocks": "hardhat deploy --tags enclave,mocks",
     "ciphernode:add": "hardhat ciphernode:add",
     "ciphernode:remove": "hardhat ciphernode:remove",
     "lint": "yarn lint:sol && yarn lint:ts && yarn prettier:check",

packages/evm/tasks/ciphernode.ts

@@ -18,21 +18,3 @@ task("ciphernode:add", "Register a ciphernode to the registry")
 
     console.log(`Ciphernode ${taskArguments.ciphernodeAddress} registered`);
   });
-
-task("ciphernode:remove", "Remove a ciphernode from the registry")
-  .addParam("ciphernodeAddress", "address of ciphernode to remove")
-  .setAction(async function (taskArguments: TaskArguments, hre) {
-    const registry = await hre.deployments.get("CiphernodeRegistryOwnable");
-
-    const registryContract = await hre.ethers.getContractAt(
-      "CiphernodeRegistryOwnable",
-      registry.address,
-    );
-
-    const tx = await registryContract.removeCiphernode(
-      taskArguments.ciphernodeAddress,
-    );
-    await tx.wait();
-
-    console.log(`Ciphernode ${taskArguments.ciphernodeAddress} removed`);
-  });

packages/evm/tasks/committee.ts

@@ -1,11 +1,14 @@
 import { task, types } from "hardhat/config";
 import type { TaskArguments } from "hardhat/types";
 
-task("committee:new", "Request a new ciphernode committee")
+task(
+  "committee:new",
+  "Request a new ciphernode committee, will use E3 mock contracts by default",
+)
   .addOptionalParam(
     "filter",
     "address of filter contract to use",
-    "0x0000000000000000000000000000000000000006",
+    undefined,
     types.string,
   )
   .addOptionalParam(
@@ -41,7 +44,7 @@ task("committee:new", "Request a new ciphernode committee")
   .addOptionalParam(
     "e3Address",
     "address of the E3 program",
-    "0x95E366f13c16976A26339aBe7992a1AB523388f5",
+    undefined,
     types.string,
   )
   .addOptionalParam(
@@ -64,34 +67,49 @@ task("committee:new", "Request a new ciphernode committee")
       enclave.address,
     );
 
-    try {
-      const enableE3Tx = await enclaveContract.enableE3Program(
-        taskArguments.e3Address,
+    let e3Address = taskArguments.e3Address;
+    if (!e3Address) {
+      const mockE3Program = await hre.deployments.get("MockE3Program");
+      if (!mockE3Program) {
+        throw new Error("MockE3Program not deployed");
+      }
+      e3Address = mockE3Program.address;
+    }
+
+    let filterAddress = taskArguments.filter;
+    if (!filterAddress) {
+      const naiveRegistryFilter = await hre.deployments.get(
+        "NaiveRegistryFilter",
       );
+      if (!naiveRegistryFilter) {
+        throw new Error("NaiveRegistryFilter not deployed");
+      }
+      filterAddress = naiveRegistryFilter.address;
+    }
+
+    try {
+      const enableE3Tx = await enclaveContract.enableE3Program(e3Address);
       await enableE3Tx.wait();
-    } catch (e: unknown) {
-      console.log(
-        "E3 program enabling failed, probably already enabled: ",
-        e.message,
-      );
+    } catch (e) {
+      console.log("E3 program enabling failed, probably already enabled: ", e);
     }
 
     console.log(
       "requesting committee...",
-      taskArguments.filter,
+      filterAddress,
       [taskArguments.thresholdQuorum, taskArguments.thresholdTotal],
       [taskArguments.windowStart, taskArguments.windowEnd],
       taskArguments.duration,
-      taskArguments.e3Address,
+      e3Address,
       taskArguments.e3Params,
       taskArguments.computeParams,
     );
     const tx = await enclaveContract.request(
-      taskArguments.filter,
+      filterAddress,
       [taskArguments.thresholdQuorum, taskArguments.thresholdTotal],
       [taskArguments.windowStart, taskArguments.windowEnd],
       taskArguments.duration,
-      taskArguments.e3Address,
+      e3Address,
       taskArguments.e3Params,
       taskArguments.computeParams,
       // 1 ETH