Мigrate to truffle

.circleci/config.yml

@@ -28,6 +28,12 @@ step_setup_global_packages: &step_setup_global_packages
     name: "Set up global packages"
     command: |
       npm install
+step_pull_solc_docker: &step_pull_solc_docker
+  run:
+    name: "Pull solc docker images"
+    command: |
+      docker pull ethereum/solc:0.5.4
+      docker pull ethereum/solc:0.6.12
 step_setup_slither: &step_setup_slither
   run:
     name: "Setup slither analyser https://github.com/crytic/slither"
@@ -46,13 +52,16 @@ jobs:
     steps:
       - checkout
       - <<: *step_restore_cache
+      - setup_remote_docker:
+          version: 19.03.13
+      - <<: *step_pull_solc_docker
       - <<: *step_setup_global_packages
+      - run:
+          name: "Lint JavaScript"
+          command: npm run lint:js
       - run:
           name: "Lint Solidity contracts"
           command: npm run lint:contracts
-      - run:
-          name: "Testing deployment scripts and benchmark gas costs"
-          command: npm run ganache >/dev/null 2>&1 & npm run test:deployment && npm run test:benchmark
       - run:
           name: "Compiling external library contracts"
           command: npm run compile:lib
@@ -66,11 +75,20 @@ jobs:
           name: "Compiling test contracts"
           command: npm run compile:test
       - run:
-          name: "Lint JavaScript"
-          command: npm run lint:js
+          name: "Provision lib artefacts"
+          command: npm run provision:lib:artefacts
+      - run:
+          name: "Test deployment scripts"
+          command: npm run ganache >/dev/null 2>&1 & npm run test:deployment
+          no_output_timeout: 60m
       - run:
           name: "Running unit tests"
           command: npm run ganache >/dev/null 2>&1 & npm run test
+      # Save coverage artifacts
+      - store_artifacts:
+          path: gas-usage-report.log
+          destination: reports/gas-usage-report.log
+      - run: npx codechecks
       - run:
           name: "Running coverage"
           command: |
@@ -81,11 +99,15 @@ jobs:
       # Save coverage artifacts
       - store_artifacts:
           path: coverage
+          destination: coverage-artifacts
   security-test:
     <<: *job_python
     steps:
       - checkout
       - <<: *step_restore_cache
+      - setup_remote_docker:
+          version: 19.03.13
+      - <<: *step_pull_solc_docker
       - <<: *step_setup_global_packages
       - <<: *step_setup_slither
       - <<: *step_setup_solc_select

.eslintignore

@@ -4,4 +4,5 @@ build/*
 contracts/*
 contracts-test/*
 coverage/*
-lib/*
+lib/*
+scripts/coverage.js

.eslintrc

@@ -17,7 +17,14 @@
     "no-underscore-dangle": "off",
     "no-await-in-loop": "off",
     "no-restricted-syntax": "off",
-    "guard-for-in": "off"
+    "guard-for-in": "off",
+    "function-paren-newline": "off",
+    "comma-dangle": "off",
+    "object-curly-newline": "off",
+    "no-unused-expressions": "off",
+    "import/no-extraneous-dependencies": "off",
+    "import/no-unresolved": "off"
+
   },
   "parserOptions": {
     "ecmaVersion": 2018

.gitignore

@@ -4,6 +4,7 @@ build-legacy
 tmp
 bin
 .outputParameter
+flatten
 
 ## Core latex/pdflatex auxiliary files:
 *.aux
@@ -28,17 +29,17 @@ bin
 
 .env
 utils/config/*.json
-!utils/config/ganache.json
+!utils/config/development.json
 !utils/config/kovan.json
 !utils/config/kovan-fork.json
+ganache-accounts.json
 
-## Etherlime
-**/.etherlime-store
-flat
+## solidity-coverage
 .coverage_artifacts
 .coverage_contracts
 .coverage_tests
 coverage
 coverage.json
 
-crytic-export
+crytic-export
+gas-usage-report.log

.solcover.js

@@ -0,0 +1,15 @@
+module.exports = {
+  client: require('ganache-cli'),
+  skipFiles: [
+    "../contracts-test",
+    "../contracts-legacy",
+    "../lib"
+  ],
+  providerOptions: {
+    port: 8555,
+    _chainId: 1895,
+    network_id: 1597649375983,
+    account_keys_path: "./ganache-accounts.json",
+    default_balance_ether: 10000
+  }
+};

codechecks.yml

@@ -0,0 +1,2 @@
+checks:
+  - name: eth-gas-reporter/codechecks

contracts/infrastructure/DexRegistry.sol

@@ -17,7 +17,7 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../infrastructure/base/Owned.sol";
+import "./base/Owned.sol";
 import "./IDexRegistry.sol";
 
 /**

contracts/modules/ApprovedTransfer/ApprovedTransfer.sol → contracts/modules/ApprovedTransfer.sol

@@ -17,11 +17,11 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/Utils.sol";
-import "../common/LimitUtils.sol";
-import "../common/BaseTransfer.sol";
-import "../../infrastructure/storage/ILimitStorage.sol";
-import "../../infrastructure/storage/IGuardianStorage.sol";
+import "./common/Utils.sol";
+import "./common/LimitUtils.sol";
+import "./common/BaseTransfer.sol";
+import "../infrastructure/storage/ILimitStorage.sol";
+import "../infrastructure/storage/IGuardianStorage.sol";
 
 /**
  * @title ApprovedTransfer

contracts/modules/RelayerManager/RelayerManager.sol → contracts/modules/RelayerManager.sol

@@ -17,13 +17,13 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/Utils.sol";
-import "../common/BaseFeature.sol";
-import "../common/GuardianUtils.sol";
-import "../common/LimitUtils.sol";
-import "../../infrastructure/storage/ILimitStorage.sol";
-import "../../infrastructure/ITokenPriceRegistry.sol";
-import "../../infrastructure/storage/IGuardianStorage.sol";
+import "./common/Utils.sol";
+import "./common/BaseFeature.sol";
+import "./common/GuardianUtils.sol";
+import "./common/LimitUtils.sol";
+import "../infrastructure/storage/ILimitStorage.sol";
+import "../infrastructure/ITokenPriceRegistry.sol";
+import "../infrastructure/storage/IGuardianStorage.sol";
 
 /**
  * @title RelayerManager

contracts/modules/TokenExchanger/TokenExchanger.sol → contracts/modules/TokenExchanger.sol

@@ -17,11 +17,11 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/BaseFeature.sol";
-import "../../../lib/other/ERC20.sol";
-import "../../../lib/paraswap/IAugustusSwapper.sol";
-import "../../infrastructure/ITokenPriceRegistry.sol";
-import "../../infrastructure/IDexRegistry.sol";
+import "./common/BaseFeature.sol";
+import "../../lib/other/ERC20.sol";
+import "../../lib/paraswap/IAugustusSwapper.sol";
+import "../infrastructure/ITokenPriceRegistry.sol";
+import "../infrastructure/IDexRegistry.sol";
 
 /**
  * @title TokenExchanger

contracts/modules/TransferManager/TransferManager.sol → contracts/modules/TransferManager.sol

@@ -17,13 +17,13 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/Utils.sol";
-import "../common/BaseTransfer.sol";
-import "../common/LimitUtils.sol";
-import "../../infrastructure/storage/ILimitStorage.sol";
-import "../../infrastructure/storage/ITransferStorage.sol";
-import "../../infrastructure/ITokenPriceRegistry.sol";
-import "../../../lib/other/ERC20.sol";
+import "./common/Utils.sol";
+import "./common/BaseTransfer.sol";
+import "./common/LimitUtils.sol";
+import "../infrastructure/storage/ILimitStorage.sol";
+import "../infrastructure/storage/ITransferStorage.sol";
+import "../infrastructure/ITokenPriceRegistry.sol";
+import "../../lib/other/ERC20.sol";
 
 /**
  * @title TransferManager

deployment/1_setup_test_environment.js

@@ -1,112 +1,104 @@
-const ENSRegistry = require("../build/ENSRegistry");
-const ENSRegistryWithFallback = require("../build/ENSRegistryWithFallback");
-const UniswapFactory = require("../lib/uniswap/UniswapFactory");
-const UniswapExchange = require("../lib/uniswap/UniswapExchange");
-const MakerMigration = require("../build/MockScdMcdMigration");
+/* global artifacts */
+
+global.web3 = web3;
+
+const ENSRegistry = artifacts.require("ENSRegistry");
+const ENSRegistryWithFallback = artifacts.require("ENSRegistryWithFallback");
+const UniswapFactory = artifacts.require("../lib/uniswap/UniswapFactory");
+const UniswapExchange = artifacts.require("../lib/uniswap/UniswapExchange");
+const MakerMigration = artifacts.require("MockScdMcdMigration");
 
 // Paraswap
-const AugustusSwapper = require("../build/AugustusSwapper");
-const Whitelisted = require("../build/Whitelisted");
-const PartnerRegistry = require("../build/PartnerRegistry");
-const PartnerDeployer = require("../build/PartnerDeployer");
-const KyberAdapter = require("../build/Kyber");
+const AugustusSwapper = artifacts.require("AugustusSwapper");
+const Whitelisted = artifacts.require("Whitelisted");
+const PartnerRegistry = artifacts.require("PartnerRegistry");
+const PartnerDeployer = artifacts.require("PartnerDeployer");
+const KyberAdapter = artifacts.require("Kyber");
 
 const utils = require("../utils/utilities.js");
-const DeployManager = require("../utils/deploy-manager.js");
+const deployManager = require("../utils/deploy-manager.js");
 
 const BYTES32_NULL = "0x0000000000000000000000000000000000000000000000000000000000000000";
 
 // For development purpose
-async function deployENSRegistry(deployer, owner, domain) {
-  const { gasPrice } = deployer.defaultOverrides;
+async function deployENSRegistry(owner, domain) {
   // Deploy the public ENS registry
-  const ensRegistryWithoutFallback = await deployer.deploy(ENSRegistry);
-  const ENSWrapper = await deployer.deploy(ENSRegistryWithFallback, {}, ensRegistryWithoutFallback.contractAddress);
+  const ensRegistryWithoutFallback = await ENSRegistry.new();
+  const ENSWrapper = await ENSRegistryWithFallback.new(ensRegistryWithoutFallback.address);
 
   // ENS domain
   const parts = domain.split(".");
   const extension = parts[1];
   const domainName = parts[0];
 
   // Create the 'eth' and 'xyz' namespaces
-  const setSubnodeOwnerXYZ = await ENSWrapper.contract.setSubnodeOwner(BYTES32_NULL, utils.sha3(extension), owner, { gasPrice });
-  await ENSWrapper.verboseWaitForTransaction(setSubnodeOwnerXYZ, `Setting Subnode Owner for ${extension}`);
+  console.log(`Setting Subnode Owner for ${extension}`);
+  await ENSWrapper.setSubnodeOwner(BYTES32_NULL, utils.sha3(extension), owner);
 
   // Create the 'argentx.xyz' wallet ENS namespace
-  const setSubnodeOwnerArgent = await ENSWrapper.contract.setSubnodeOwner(utils.namehash(extension), utils.sha3(domainName), owner, { gasPrice });
-  await ENSWrapper.verboseWaitForTransaction(setSubnodeOwnerArgent, `Setting Subnode Owner for ${domainName}.${extension}`);
+  console.log(`Setting Subnode Owner for ${domainName}.${extension}`);
+  await ENSWrapper.setSubnodeOwner(utils.namehash(extension), utils.sha3(domainName), owner);
 
-  return ENSWrapper.contractAddress;
+  return ENSWrapper.address;
 }
 
-async function deployParaswap(deployer) {
-  const deploymentAccount = await deployer.signer.getAddress();
-  const whitelist = await deployer.deploy(Whitelisted);
-  const partnerDeployer = await deployer.deploy(PartnerDeployer);
-  const partnerRegistry = await deployer.deploy(PartnerRegistry, {}, partnerDeployer.contractAddress);
-  const paraswap = await deployer.deploy(
-    AugustusSwapper,
-    {},
-    whitelist.contractAddress,
+async function deployParaswap(deploymentAccount) {
+  const whitelist = await Whitelisted.new();
+  const partnerDeployer = await PartnerDeployer.new();
+  const partnerRegistry = await PartnerRegistry.new(partnerDeployer.address);
+  const paraswap = await AugustusSwapper.new(
+    whitelist.address,
     deploymentAccount,
-    partnerRegistry.contractAddress,
+    partnerRegistry.address,
     deploymentAccount,
     deploymentAccount,
   );
-  const kyberAdapter = await deployer.deploy(KyberAdapter, {}, deploymentAccount);
-  await whitelist.addWhitelisted(kyberAdapter.contractAddress);
-  return { paraswap: paraswap.contractAddress, kyberAdapter: kyberAdapter.contractAddress };
+  const kyberAdapter = await KyberAdapter.new(deploymentAccount);
+  await whitelist.addWhitelisted(kyberAdapter.address);
+  return { paraswap: paraswap.address, kyberAdapter: kyberAdapter.address };
 }
 
-const deploy = async (network) => {
-  const manager = new DeployManager(network);
-  await manager.setup();
-
-  const { configurator } = manager;
-  const { deployer } = manager;
-  const { gasPrice } = deployer.defaultOverrides;
-
+async function main() {
+  const { configurator, deploymentAccount } = await deployManager.getProps();
   const { config } = configurator;
 
-  const deploymentAccount = await deployer.signer.getAddress();
-
   if (config.ENS.deployOwnRegistry) {
     // on some testnets, we use our own ENSRegistry
-    const address = await deployENSRegistry(deployer, deploymentAccount, config.ENS.domain);
+    const address = await deployENSRegistry(deploymentAccount, config.ENS.domain);
     configurator.updateENSRegistry(address);
   }
 
   if (config.defi.paraswap.deployOwn) {
-    const { paraswap, kyberAdapter } = await deployParaswap(deployer);
+    const { paraswap, kyberAdapter } = await deployParaswap(deploymentAccount);
     configurator.updateParaswap(paraswap, { Kyber: kyberAdapter });
   }
 
   if (config.defi.uniswap.deployOwn) {
-    const UniswapFactoryWrapper = await deployer.deploy(UniswapFactory);
-    configurator.updateUniswapFactory(UniswapFactoryWrapper.contractAddress);
-    const UniswapExchangeTemplateWrapper = await deployer.deploy(UniswapExchange);
-    const initializeFactoryTx = await UniswapFactoryWrapper.contract.initializeFactory(UniswapExchangeTemplateWrapper.contractAddress, { gasPrice });
-    await UniswapFactoryWrapper.verboseWaitForTransaction(initializeFactoryTx, "Initializing UniswapFactory");
+    const UniswapFactoryWrapper = await UniswapFactory.new();
+    configurator.updateUniswapFactory(UniswapFactoryWrapper.address);
+    const UniswapExchangeTemplateWrapper = await UniswapExchange.new();
+    await UniswapFactoryWrapper.initializeFactory(UniswapExchangeTemplateWrapper.address);
   }
 
   if (config.defi.maker.deployOwn) {
     // Deploy Maker's mock Migration contract if needed
-    const MakerMigrationWrapper = await deployer.deploy(
-      MakerMigration,
-      {},
+    const MakerMigrationWrapper = await MakerMigration.new(
       config.defi.maker.vat || "0x0000000000000000000000000000000000000000",
       config.defi.maker.daiJoin || "0x0000000000000000000000000000000000000000",
       config.defi.maker.wethJoin || "0x0000000000000000000000000000000000000000",
       config.defi.maker.tub || "0x0000000000000000000000000000000000000000",
       config.defi.maker.cdpManager || "0x0000000000000000000000000000000000000000",
     );
-    configurator.updateMakerMigration(MakerMigrationWrapper.contractAddress);
+    configurator.updateMakerMigration(MakerMigrationWrapper.address);
   }
 
   // save configuration
   await configurator.save();
-};
 
-module.exports = {
-  deploy,
+  console.log("## completed deployment script 1 ##");
+}
+
+// For truffle exec
+module.exports = function (callback) {
+  main().then(() => callback()).catch((err) => callback(err));
 };