diff options
| author | Jacob Evans <jacob@dekz.net> | 2018-04-18 08:06:13 +0800 |
|---|---|---|
| committer | Jacob Evans <jacob@dekz.net> | 2018-04-18 08:06:13 +0800 |
| commit | d87d93dfacc56c2eaa0de052e6c57037f200e35b (patch) | |
| tree | dd332820f5b8f7226596d1611754e34fd60f197d /packages/contracts | |
| parent | bf4873e519762c6e13bb68c7a6757cc1ec25eb77 (diff) | |
| download | dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.gz dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.bz2 dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.lz dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.xz dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.zst dexon-sol-tools-d87d93dfacc56c2eaa0de052e6c57037f200e35b.zip | |
Update deployer and contracts repo to use solidity 0.4.22
Diffstat (limited to 'packages/contracts')
| -rw-r--r-- | packages/contracts/package.json | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index eb1701a18..67d4257f5 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -15,10 +15,13 @@ "test": "run-s build run_mocha", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit", - "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", - "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir ../migrations/src/artifacts", + "compile:comment": + "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", + "compile": + "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir ../migrations/src/artifacts", "clean": "shx rm -rf ./lib", - "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", + "generate_contract_wrappers": + "node ../abi-gen/lib/index.js --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", @@ -26,8 +29,10 @@ "test:circleci": "yarn test:coverage" }, "config": { - "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json", - "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels" + "abis": + "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json", + "contracts": + "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels" }, "repository": { "type": "git", @@ -54,7 +59,7 @@ "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "shx": "^0.2.2", - "solc": "^0.4.18", + "solc": "^0.4.22", "tslint": "5.8.0", "typescript": "2.7.1", "yargs": "^10.0.3" |