Merge pull request #52 from gnosisguild/deploy-cleanup

Better deploy script

.gitignore

@@ -3,4 +3,6 @@ node_modules
 
 
 # ciphernode
-target
+target
+
+*.DS_Store

packages/evm/.env.example

@@ -0,0 +1,4 @@
+MNEMONIC=
+INFURA_KEY=
+
+ETHERSCAN_API_KEY=

packages/evm/.gitignore

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

packages/evm/README.md

@@ -0,0 +1,12 @@
+# Enclave EVM
+
+## To deploy
+
+```
+yarn deploy --network [network]
+```
+
+This will add the deployment information to the `./deployments` directory.
+
+Be sure to configure your desired network in `hardhat.config.ts` before
+deploying.

packages/evm/contracts/registry/NaiveRegistryFilter.sol

@@ -53,8 +53,8 @@ contract NaiveRegistryFilter is IRegistryFilter, OwnableUpgradeable {
     //                                                        //
     ////////////////////////////////////////////////////////////
 
-    constructor(address _owner, address _enclave) {
-        initialize(_owner, _enclave);
+    constructor(address _owner, address _registry) {
+        initialize(_owner, _registry);
     }
 
     function initialize(address _owner, address _registry) public initializer {

packages/evm/contracts/test/MockRegistryFilter.sol

@@ -14,7 +14,7 @@ interface IRegistry {
     ) external;
 }
 
-contract NaiveRegistryFilter is IRegistryFilter, OwnableUpgradeable {
+contract MockNaiveRegistryFilter is IRegistryFilter, OwnableUpgradeable {
     struct Committee {
         address[] nodes;
         uint32[2] threshold;

packages/evm/deploy/deploy.ts

@@ -2,18 +2,63 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 const THIRTY_DAYS_IN_SECONDS = 60 * 60 * 24 * 30;
+const addressOne = "0x0000000000000000000000000000000000000001";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await hre.getNamedAccounts();
   const { deploy } = hre.deployments;
 
+  // Deploy Enclave contract
+
   const enclave = await deploy("Enclave", {
     from: deployer,
-    args: [THIRTY_DAYS_IN_SECONDS],
+    args: [deployer, addressOne, THIRTY_DAYS_IN_SECONDS],
     log: true,
   });
 
   console.log(`Enclave contract: `, enclave.address);
+
+  // Deploy CyphernodeRegistryOwnable contract
+
+  const cypherNodeRegistry = await deploy("CyphernodeRegistryOwnable", {
+    from: deployer,
+    args: [deployer, enclave.address],
+    log: true,
+  });
+
+  console.log(
+    `CyphernodeRegistryOwnable contract: `,
+    cypherNodeRegistry.address,
+  );
+
+  // Deploy NaiveRegistryFilter contract
+
+  const naiveRegistryFilter = await deploy("NaiveRegistryFilter", {
+    from: deployer,
+    args: [deployer, cypherNodeRegistry.address],
+    log: true,
+  });
+
+  console.log(`NaiveRegistryFilter contract: `, naiveRegistryFilter.address);
+
+  // set registry in enclave
+  const enclaveContract = await hre.ethers.getContractAt(
+    "Enclave",
+    enclave.address,
+  );
+
+  const registryAddress = await enclaveContract.cyphernodeRegistry();
+
+  if (registryAddress === cypherNodeRegistry.address) {
+    console.log(`Enclave contract already has registry`);
+    return;
+  }
+
+  const result = await enclaveContract.setCyphernodeRegistry(
+    cypherNodeRegistry.address,
+  );
+  await result.wait();
+  console.log(`Enclave contract updated with registry`);
 };
 export default func;
 func.id = "deploy_enclave"; // id required to prevent reexecution

packages/evm/deployments/sepolia/.chainId

@@ -0,0 +1 @@
+11155111