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
@@ -44,7 +43,6 @@ jobs:
             # 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
@@ -54,6 +52,15 @@ jobs:
           at: .
       - run: npm run lint
 
+  test-unit:
+    <<: *env_defaults
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run: npx @nomiclabs/buidler compile
+      - run: npm run test:unit
+
   test-contracts:
     <<: *env_defaults
     parallelism: 4
@@ -160,6 +167,9 @@ workflows:
       - lint:
           requires:
             - prepare
+      - test-unit:
+          requires:
+            - prepare
       - test-contracts:
           requires:
             - prepare

.travis.yml

@@ -3,8 +3,10 @@ language: node_js
 node_js:
   - 10.16.3
 env:
+  - UNIT=1
   - COVERAGE=1
   - GAS=1
 script:
+  - if [ "$UNIT" = "1" ]; then npm run test:unit; fi
   - 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

buidler.config.js

@@ -0,0 +1,24 @@
+const { usePlugin } = require('@nomiclabs/buidler/config');
+
+usePlugin('@nomiclabs/buidler-truffle5');
+usePlugin('solidity-coverage');
+
+module.exports = {
+	solc: {
+		version: '0.4.25',
+	},
+	paths: {
+		sources: './contracts',
+		tests: './test/unit',
+		artifacts: './build/artifacts',
+		cache: './build/cache',
+	},
+	networks: {
+		coverage: {
+			initialDate: '2019-03-06T00:00:00',
+			url: 'http://localhost:8545',
+			blockGasLimit: 0x1fffffffffffff,
+			allowUnlimitedContractSize: true,
+		},
+	},
+};

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);
+    }
 }