Migrating to buidler

.circleci/config.yml

@@ -32,7 +32,6 @@ jobs:
             - 'v2-dependencies-{{ checksum "package-lock.json" }}'
             - v2-dependencies-
       - run: npm install
-      - run: npx truffle compile
       - save_cache:
           paths:
             - node_modules
@@ -41,10 +40,6 @@ jobs:
           root: .
           paths:
             - node_modules
-            # add compiled contracts to persisted workspace
-            # (note not currently working due to:
-            # https://github.com/trufflesuite/truffle/issues/2239#issuecomment-552041859)
-            - build
 
   lint:
     <<: *env_defaults
@@ -56,20 +51,16 @@ jobs:
 
   test-contracts:
     <<: *env_defaults
-    parallelism: 4
-    # can bump this up if need be: https://circleci.com/docs/2.0/configuration-reference/#docker-executor
-    resource_class: medium+ # default
     steps:
       - checkout
       - attach_workspace:
           at: .
-      - run: circleci tests glob "test/contracts/*.js" | circleci tests split --split-by=timings > /tmp/contracts-to-test
+      - run: npx buidler compile
       - run:
-          name: Tests in parallel
+          name: Test and output gas used
           command: |
             set +e
-            npm run ganache > /dev/null & # start ganache in background
-            npm run test:core -- $(cat /tmp/contracts-to-test)
+            npm test
             EXIT_CODE=$?
             cat test-gas-used.log
             printf "\\n"

.eslintignore

@@ -0,0 +1,2 @@
+build/*
+coverage/*

.eslintrc.js

@@ -1,11 +1,6 @@
 module.exports = {
 	extends: ['standard', 'plugin:prettier/recommended', 'plugin:node/recommended'],
-	globals: {
-		artifacts: true,
-		assert: true,
-		contract: true,
-		web3: true,
-	},
+	globals: {},
 	env: {
 		mocha: true,
 		node: true,

.gitignore

@@ -5,12 +5,12 @@ deploy_settings.py
 
 # gitignore - Truffle proj
 .idea/
-build/
+build
 bin/
 node_modules
 yarn-error.log
 
-# mkdocs 
+# mkdocs
 site/
 
 # Our environment settings
@@ -22,9 +22,6 @@ flattened-contracts/
 # For eth-gas-reporter in tests
 test-gas-used.log
 
-# For integration testing
-keys.json
-
 # vscode
 .vscode/launch.json
 

.solcover.js

@@ -1,11 +1,15 @@
+const {
+	constants: { inflationStartTimestampInSecs },
+} = require('.');
+
 module.exports = {
 	port: 8545,
 	skipFiles: ['test-helpers'],
-	client: require('ganache-cli'), // use ganache-cli version listed in dev deps
 	providerOptions: {
 		default_balance_ether: 10000000000000, // extra zero just in case (coverage consumes more gas)
-		time: new Date('2019-03-06T00:00:00'),
+		time: new Date(inflationStartTimestampInSecs * 1000),
 		network_id: 55,
+		gasLimit: 0x1fffffffffffff,
 	},
 	mocha: {
 		grep: '@cov-skip', // Find everything with this tag

.travis.yml

@@ -4,7 +4,8 @@ node_js:
   - 10.16.3
 env:
   - COVERAGE=1
-  - GAS=1
+  # - GAS=1
 script:
   - if [ "$COVERAGE" = "1" ]; then npm run coverage && bash <(curl -s https://codecov.io/bash); fi
-  - if [ "$GAS" = "1" ]; then npm ci && npm test && npx codechecks; fi
+#   Replace with below once gas reporting works again
+#  - if [ "$GAS" = "1" ]; then npm test && npx codechecks; fi

buidler.config.js

@@ -0,0 +1,38 @@
+const { usePlugin } = require('@nomiclabs/buidler/config');
+
+usePlugin('@nomiclabs/buidler-truffle5'); // uses and exposes web3 via buidler-web3 plugin
+usePlugin('solidity-coverage');
+
+const {
+	constants: { inflationStartTimestampInSecs },
+} = require('.');
+
+const GAS_PRICE = 20e9; // 20 GWEI
+
+const baseNetworkConfig = {
+	allowUnlimitedContractSize: true,
+	blockGasLimit: 0x1fffffffffffff,
+	initialDate: new Date(inflationStartTimestampInSecs * 1000).toISOString(),
+	gasPrice: GAS_PRICE,
+};
+module.exports = {
+	GAS_PRICE,
+	solc: {
+		version: '0.4.25',
+	},
+	paths: {
+		sources: './contracts',
+		tests: './test/contracts',
+		artifacts: './build/artifacts',
+		cache: './build/cache',
+	},
+	networks: {
+		buidlerevm: baseNetworkConfig,
+		coverage: Object.assign(
+			{
+				url: 'http://localhost:8545',
+			},
+			baseNetworkConfig
+		),
+	},
+};

contracts/EtherCollateral.sol

@@ -294,7 +294,7 @@ contract EtherCollateral is Owned, Pausable, ReentrancyGuard, MixinResolver {
         uint256 loanAmount = loanAmountFromCollateral(msg.value);
 
         // Require sETH to mint does not exceed cap
-        require(totalIssuedSynths.add(loanAmount) < issueLimit, "Loan Amount exceeds the supply cap. ");
+        require(totalIssuedSynths.add(loanAmount) < issueLimit, "Loan Amount exceeds the supply cap.");
 
         // Get a Loan ID
         loanID = _incrementTotalLoansCounter();

contracts/Issuer.sol

@@ -22,7 +22,7 @@ contract Issuer is MixinResolver {
     // Minimum Stake time may not exceed 1 weeks.
     uint public constant MAX_MINIMUM_STAKING_TIME = 1 weeks;
 
-    uint public minimumStakeTime = 8 hours; // default minimum waiting period after issuing synths
+    uint public minimumStakeTime = 24 hours; // default minimum waiting period after issuing synths
 
     /* ========== ADDRESS RESOLVER CONFIGURATION ========== */
 

contracts/test-helpers/GenericMock.sol

@@ -0,0 +1,20 @@
+// Source adapted from  https://github.com/EthWorks/Doppelganger/blob/master/contracts/Doppelganger.sol
+
+/* solium-disable security/no-inline-assembly */
+pragma solidity 0.4.25;
+
+
+contract GenericMock {
+    mapping(bytes4 => bytes) mockConfig;
+
+    function() public {
+        bytes memory ret = mockConfig[msg.sig];
+        assembly {
+            return(add(ret, 0x20), mload(ret))
+        }
+    }
+
+    function mockReturns(bytes4 key, bytes value) public {
+        mockConfig[key] = value;
+    }
+}

contracts/test-helpers/MockExchanger.sol

@@ -7,6 +7,7 @@ contract MockExchanger {
     uint256 private _mockReclaimAmount;
     uint256 private _mockRefundAmount;
     uint256 private _mockNumEntries;
+    uint256 private _mockMaxSecsLeft;
 
     ISynthetix synthetix;
 
@@ -17,7 +18,6 @@ contract MockExchanger {
     // Mock settle function
     function settle(address from, bytes32 currencyKey)
         external
-        view
         returns (uint256 reclaimed, uint256 refunded, uint numEntriesSettled)
     {
         if (_mockReclaimAmount > 0) {
@@ -28,9 +28,15 @@ contract MockExchanger {
             synthetix.synths(currencyKey).issue(from, _mockRefundAmount);
         }
 
+        _mockMaxSecsLeft = 0;
+
         return (_mockReclaimAmount, _mockRefundAmount, _mockNumEntries);
     }
 
+    function maxSecsLeftInWaitingPeriod(address account, bytes32 currencyKey) public view returns (uint) {
+        return _mockMaxSecsLeft;
+    }
+
     function settlementOwing(address account, bytes32 currencyKey) public view returns (uint, uint, uint) {
         return (_mockReclaimAmount, _mockRefundAmount, _mockNumEntries);
     }
@@ -46,4 +52,8 @@ contract MockExchanger {
     function setNumEntries(uint256 _numEntries) external {
         _mockNumEntries = _numEntries;
     }
+
+    function setMaxSecsLeft(uint _maxSecsLeft) external {
+        _mockMaxSecsLeft = _maxSecsLeft;
+    }
 }

contracts/test-helpers/MockSynth.sol

@@ -0,0 +1,63 @@
+pragma solidity ^0.4.25;
+
+import "../ExternStateToken.sol";
+import "../interfaces/ISystemStatus.sol";
+
+
+// Mock synth that also adheres to system status
+
+contract MockSynth is ExternStateToken {
+    ISystemStatus private systemStatus;
+    bytes32 public currencyKey;
+
+    constructor(
+        address _proxy,
+        TokenState _tokenState,
+        string _name,
+        string _symbol,
+        uint _totalSupply,
+        address _owner,
+        bytes32 _currencyKey
+    ) public ExternStateToken(_proxy, _tokenState, _name, _symbol, _totalSupply, 18, _owner) {
+        currencyKey = _currencyKey;
+    }
+
+    // Allow SystemStatus to be passed in directly
+    function setSystemStatus(ISystemStatus _status) external {
+        systemStatus = _status;
+    }
+
+    // Used for PurgeableSynth to test removal
+    function setTotalSupply(uint256 _totalSupply) external {
+        totalSupply = _totalSupply;
+    }
+
+    function transfer(address to, uint value) external optionalProxy returns (bool) {
+        systemStatus.requireSynthActive(currencyKey);
+
+        return _transfer_byProxy(messageSender, to, value);
+    }
+
+    function transferFrom(address from, address to, uint value) external optionalProxy returns (bool) {
+        systemStatus.requireSynthActive(currencyKey);
+
+        return _transferFrom_byProxy(messageSender, from, to, value);
+    }
+
+    event Issued(address indexed account, uint value);
+
+    event Burned(address indexed account, uint value);
+
+    // Allow these functions which are typically restricted to internal contracts, be open to us for mocking
+    function issue(address account, uint amount) external {
+        tokenState.setBalanceOf(account, tokenState.balanceOf(account).add(amount));
+        totalSupply = totalSupply.add(amount);
+        emit Issued(account, amount);
+    }
+
+    function burn(address account, uint amount) external {
+        tokenState.setBalanceOf(account, tokenState.balanceOf(account).sub(amount));
+        totalSupply = totalSupply.sub(amount);
+        emit Burned(account, amount);
+    }
+}

contracts/test-helpers/PublicEST.sol

@@ -18,4 +18,11 @@ contract PublicEST is ExternStateToken {
     function transferFrom(address from, address to, uint value) external optionalProxy returns (bool) {
         return _transferFrom_byProxy(messageSender, from, to, value);
     }
+
+    // Index all parameters to make them easier to find in raw logs (as this will be emitted via a proxy and not decoded)
+    event Received(address indexed sender, uint256 indexed inputA, bytes32 indexed inputB);
+
+    function somethingToBeProxied(uint256 inputA, bytes32 inputB) external {
+        emit Received(messageSender, inputA, inputB);
+    }
 }

index.js

@@ -93,4 +93,13 @@ const getUsers = ({ network = 'mainnet', user } = {}) => {
 	return user ? users.find(({ name }) => name === user) : users;
 };
 
-module.exports = { getTarget, getSource, getSynths, toBytes32, getUsers };
+module.exports = {
+	getTarget,
+	getSource,
+	getSynths,
+	toBytes32,
+	getUsers,
+	constants: {
+		inflationStartTimestampInSecs: 1551830400, // 2019-03-06T00:00:00Z
+	},
+};