Upgrade to ganache 6.0.3

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   checkout_and_compile:
     docker:
-      - image: circleci/node:9.6.1
+      - image: circleci/node:10.11.0
     working_directory: ~/set-protocol-strategies
     steps:
       - checkout
@@ -27,7 +27,7 @@ jobs:
             - ~/set-protocol-strategies
   test:
     docker:
-      - image: circleci/node:9.6.1
+      - image: circleci/node:10.11.0
     working_directory: ~/set-protocol-strategies
     parallelism: 2
     steps:
@@ -53,7 +53,7 @@ jobs:
 
   coverage:
     docker:
-      - image: circleci/node:9.6.1
+      - image: circleci/node:10.11.0
     working_directory: ~/set-protocol-strategies
     steps:
       - setup_remote_docker:

package.json

@@ -35,6 +35,7 @@
     "precommit": "lint-staged",
     "prepare-test": "yarn setup && yarn transpile",
     "profile-gas": "yarn prepare-test && truffle test `find transpiled/test/profile -name '*.spec.js'`",
+    "postinstall": "bash scripts/fix-web3-eth-abi.sh",
     "setup": "yarn clean && yarn deploy-development && yarn generate-typings",
     "test": "yarn prepare-test && yarn truffle-test-contracts",
     "test-nocompile": "yarn transpile && yarn truffle-test-contracts",
@@ -73,7 +74,7 @@
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-util": "^5.1.2",
     "ethjs-abi": "^0.2.1",
-    "ganache-cli": "^6.1.2",
+    "ganache-cli": "^6.3.0",
     "import-sort-cli": "^4.2.0",
     "import-sort-parser-babylon": "^4.2.0",
     "import-sort-style-eslint": "^4.2.0",

scripts/fix-web3-eth-abi.sh

@@ -0,0 +1,8 @@
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  # Mac OSX
+  [ -f "node_modules/web3-eth-abi/src/index.js" ] && sed -i '' 's/(nonIndexedData)/(nonIndexedData \&\& nonIndexedData !== "0x")/' node_modules/web3-eth-abi/src/index.js
+  [ -f "node_modules/web3-eth-contract/src/index.js" ] && sed -i '' 's/abi.decodeParameters(outputs, returnValues)/(returnValues \&\& returnValues !== "0x") ? abi.decodeParameters(outputs, returnValues) : []/' node_modules/web3-eth-contract/src/index.js
+else
+  [ -f "node_modules/web3-eth-abi/src/index.js" ] && sed -i 's/(nonIndexedData)/(nonIndexedData \&\& nonIndexedData !== "0x")/' node_modules/web3-eth-abi/src/index.js
+  [ -f "node_modules/web3-eth-contract/src/index.js" ] && sed -i 's/abi.decodeParameters(outputs, returnValues)/(returnValues \&\& returnValues !== "0x") ? abi.decodeParameters(outputs, returnValues) : []/' node_modules/web3-eth-contract/src/index.js
+fi

test/contracts/managers/assetPairManager.spec.ts

@@ -42,7 +42,7 @@ import {
 } from '@utils/constants';
 
 import { expectRevertError } from '@utils/tokenAssertions';
-import { getWeb3 } from '@utils/web3Helper';
+import { getWeb3, blankTxn } from '@utils/web3Helper';
 
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
@@ -473,6 +473,7 @@ contract('AssetPairManager', accounts => {
       );
 
       await blockchain.increaseTimeAsync(timeJump);
+      await blankTxn(deployerAccount);
 
       subjectCaller = deployerAccount;
     });
@@ -973,6 +974,7 @@ contract('AssetPairManager', accounts => {
       );
 
       await blockchain.increaseTimeAsync(timeJump);
+      await blankTxn(deployerAccount);
 
       subjectCaller = deployerAccount;
     });
@@ -1190,6 +1192,7 @@ contract('AssetPairManager', accounts => {
 
     async function subject(): Promise<boolean> {
       await blockchain.increaseTimeAsync(subjectTimeFastForward);
+      await blankTxn(subjectCaller);
       return setManager.canConfirmPropose.callAsync(
         { from: subjectCaller, gas: DEFAULT_GAS}
       );

utils/web3Helper.ts

@@ -1,6 +1,6 @@
 const Web3 = require('web3'); // import web3 v1.0 constructor
 const BigNumber = require('bignumber.js');
-import { DEFAULT_GAS } from './constants';
+import { DEFAULT_GAS, NULL_ADDRESS } from './constants';
 
 // use globally injected web3 to find the currentProvider and wrap with web3 v1.0
 export const getWeb3 = () => {
@@ -26,4 +26,13 @@ export const getGasUsageInEth = async txHash => {
 
 export const txnFrom = (from: string) => {
   return { from, gas: DEFAULT_GAS };
+};
+
+export const blankTxn = async (from: string) => {
+  const web3 = getWeb3();
+  await web3.eth.sendTransaction({
+    from,
+    to: NULL_ADDRESS,
+    value: '1',
+  });
 };