Add deploy script and expose hardhat node

.gitignore

@@ -2,7 +2,7 @@
 .idea/
 .DS_Store
 artifacts/
-deploy/
+/deploy/
 cache/
 build/
 types/

.prettierrc

@@ -4,6 +4,7 @@
   "tabWidth": 2,
   "semi": true,
   "singleQuote": true,
+  "arrowParens": "avoid",
   "overrides": [
     {
       "files": "*.sol",

contracts/mocks/Disposables/DisposableTokenController.sol

@@ -21,11 +21,11 @@ contract DisposableTokenController is TokenController {
 
     token = INXMToken(_tokenAddress);
     token.changeOperator(address(this));
+    token.addToWhiteList(address(this));
 
     changeMasterAddress(_masterAddress);
     pooledStaking = IPooledStaking(_pooledStakingAddress);
     assessment = IAssessment(_assessmentAddress);
-
   }
 
   function addToWhitelist(address _member) public override {

contracts/modules/cover/ProductsV1.sol

@@ -6,7 +6,7 @@ import "../../interfaces/IProductsV1.sol";
 
 contract ProductsV1 is IProductsV1 {
   function getNewProductId(address legacyProductId) external pure override returns (uint) {
-
+    
     // Product: bZx v1
     // Type: protocol
     if (legacyProductId == 0x8B3d70d628Ebd30D4A2ea82DB95bA2e906c71633) {

contracts/modules/legacy/LegacyPooledStaking.sol

@@ -938,19 +938,14 @@ contract LegacyPooledStaking is IPooledStaking, MasterAware {
     }
   }
 
-  function initialize() public {
-    require(!initialized, "Contract is already initialized");
-    tokenController.addToWhitelist(address(this));
-    initialized = true;
-  }
-
   function changeDependentContractAddress() public {
 
     token = INXMToken(master.tokenAddress());
     tokenController = ITokenController(master.getLatestAddress("TC"));
 
     if (!initialized) {
-      initialize();
+      tokenController.addToWhitelist(address(this));
+      initialized = true;
     }
   }
 

contracts/modules/token/TokenController.sol

@@ -36,6 +36,10 @@ contract TokenController is ITokenController, LockHandler, LegacyMasterAware {
     claimsReward = claimsRewardAddress;
   }
 
+  function unlistClaimsReward() external {
+    token.removeFromWhiteList(claimsReward);
+  }
+
   /**
   * @dev Just for interface
   */
@@ -384,12 +388,4 @@ contract TokenController is ITokenController, LockHandler, LegacyMasterAware {
 
     token.transfer(to, stakeToWithdraw + rewardsToWithdraw);
   }
-
-  function initialize() external {
-    token.addToWhiteList(address(this));
-    token.removeFromWhiteList(claimsReward);
-  }
-
-  event Burned(address indexed member, bytes32 lockedUnder, uint256 amount);
-
 }

hardhat.config.js/index.js

@@ -9,7 +9,9 @@ require('hardhat-contract-sizer');
 
 require('./tasks');
 
-module.exports = {
+/** @type import('hardhat/config').HardhatUserConfig */
+const config = {
+
   contractSizer: {
     alphaSort: true,
     runOnCompile: false,
@@ -22,12 +24,29 @@ module.exports = {
 
   mocha: {
     exit: true,
-    bail: true,
+    bail: false,
     recursive: false,
     timeout: 0,
   },
 
   networks: require('./networks'),
 
   solidity: require('./solidity'),
+
 };
+
+if (process.env.ENABLE_TENDERLY) {
+
+  const tenderly = require('@tenderly/hardhat-tenderly');
+  tenderly.setup({ automaticVerifications: false });
+
+  config.tenderly = {
+    username: 'NexusMutual',
+    project: 'nexusmutual',
+    forkNetwork: 'mainnet',
+    deploymentsDir: 'deployments',
+    // privateVerification: false,
+  };
+}
+
+module.exports = config;

hardhat.config.js/networks.js

@@ -2,7 +2,7 @@ const ether = n => `${n}${'0'.repeat(18)}`;
 const networks = {
   hardhat: {
     accounts: {
-      count: 100,
+      count: 10,
       accountsBalance: ether(1000000000),
     },
     // TODO: fix tests with gasPrice = 0 and remove the hardfork param
@@ -26,7 +26,7 @@ const getenv = (network, key, fallback, parser = i => i) => {
   return value ? parser(value) : fallback;
 };
 
-for (const network of ['MAINNET', 'KOVAN', 'RINKEBY', 'TENDERLY', 'LOCALHOST']) {
+for (const network of ['MAINNET', 'GOERLI', 'KOVAN', 'RINKEBY', 'TENDERLY', 'LOCALHOST']) {
   const url = getenv(network, 'PROVIDER_URL', false);
   if (!url) continue;
   const accounts = getenv(network, 'ACCOUNT_KEY', undefined, v => v.split(/[^0-9a-fx]+/i));

hardhat.config.js/solidity.js

@@ -1,4 +1,6 @@
-const compilerSettings = process.env.ENABLE_OPTIMIZER ? { optimizer: { enabled: true, runs: 200 } } : {};
+const compilerSettings = process.env.ENABLE_OPTIMIZER
+  ? { optimizer: { enabled: true, runs: 200 } }
+  : {};
 
 const compilers = {
   '0.5.7': { settings: compilerSettings, version: '0.5.7' }, // nexus mutual v1
@@ -8,11 +10,6 @@ const compilers = {
 
 const contracts = {
   '0.5.7': ['contracts/modules/governance/Governance.sol'],
-  '0.5.17': [
-    '@uniswap/lib/contracts/libraries/FixedPoint.sol',
-    '@uniswap/v2-core/contracts/interfaces/IUniswapV2Pair.sol',
-    '@uniswap/v2-periphery/contracts/libraries/UniswapV2OracleLibrary.sol',
-  ],
 };
 
 const overrides = {};

lib/helpers.js

@@ -1,41 +1,9 @@
 const assert = require('assert');
-const exec = require('child_process').execSync;
-
-const { network, web3 } = require('hardhat');
 const readline = require('readline');
-
-const { BN, toBN } = web3.utils;
+const { BN, toBN } = require('web3').utils;
 
 const hex = string => '0x' + Buffer.from(string).toString('hex');
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
-const formatJSON = json => JSON.stringify(json, null, 2);
-
-function getEnv (key, fallback = undefined) {
-
-  const value = process.env[key] || fallback;
-
-  if (typeof value === 'undefined') {
-    throw new Error(`Missing env var: ${key}`);
-  }
-
-  return value;
-}
-
-async function getNetwork () {
-
-  const chainId = await web3.eth.getChainId();
-  const networks = {
-    1: 'mainnet',
-    42: 'kovan',
-    31337: 'hardhat',
-  };
-
-  if (!networks[chainId]) {
-    throw new Error(`Unknown network with id ${chainId}`);
-  }
-
-  return networks[chainId];
-}
 
 const filterArgsKeys = args => {
   const params = {};
@@ -48,42 +16,6 @@ const filterArgsKeys = args => {
   return params;
 };
 
-/**
- * Export tx to tenderly. Accepts a tx hash string or a promise that resolves to a receipt.
- * Returns the receipt if a promise was passed.
- * @param {string|Promise} txPromise
- * @return {function((string|Promise)): Promise<(undefined|{})>}
- */
-const tenderly = async txPromise => {
-
-  let tx = txPromise;
-  let receipt;
-
-  if (typeof txPromise !== 'string') {
-    const [ok, err] = await to(txPromise);
-    receipt = (ok || err);
-    tx = receipt.tx;
-  }
-
-  assert(network.name !== 'hardhat', 'Tenderly: network provider required to export tx');
-  const providerURL = network.config.url.replace(/^http:\/\//, '');
-  const cmd = `tenderly export ${tx} --rpc ${providerURL} --debug`;
-
-  console.log(`Executing: ${cmd}`);
-  await exec(cmd, { stdio: 'inherit' });
-
-  return receipt;
-};
-
-const logEvents = receipt => {
-  receipt.logs.forEach(log => {
-    const { event, args } = log;
-    const params = filterArgsKeys(args);
-    console.log(`Event emitted: ${event}(${formatJSON(params)}`);
-  });
-  return receipt;
-};
-
 const to = promise => new Promise(resolve => {
   promise
     .then(r => resolve([r, null]))
@@ -129,13 +61,9 @@ function zeroPadRight (bytes, length) {
 module.exports = {
   bnEqual,
   filterArgsKeys,
-  getEnv,
-  getNetwork,
   hex,
-  logEvents,
   sleep,
   to,
-  tenderly,
   waitForInput,
-  zeroPadRight
+  zeroPadRight,
 };

lib/index.js

@@ -1,7 +1,9 @@
 const constants = require('./constants');
 const helpers = require('./helpers');
+const proposalCategories = require('./proposal-categories');
 
 module.exports = {
   constants,
   helpers,
+  proposalCategories,
 };