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/deployer | |
| parent | bf4873e519762c6e13bb68c7a6757cc1ec25eb77 (diff) | |
| download | dexon-0x-contracts-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.gz dexon-0x-contracts-d87d93dfacc56c2eaa0de052e6c57037f200e35b.tar.zst dexon-0x-contracts-d87d93dfacc56c2eaa0de052e6c57037f200e35b.zip | |
Update deployer and contracts repo to use solidity 0.4.22
Diffstat (limited to 'packages/deployer')
| -rw-r--r-- | packages/deployer/CHANGELOG.json | 8 | ||||
| -rw-r--r-- | packages/deployer/package.json | 12 | ||||
| -rw-r--r-- | packages/deployer/src/solc/bin_paths.ts | 1 |
3 files changed, 15 insertions, 6 deletions
diff --git a/packages/deployer/CHANGELOG.json b/packages/deployer/CHANGELOG.json index b130405dc..c6dc6262c 100644 --- a/packages/deployer/CHANGELOG.json +++ b/packages/deployer/CHANGELOG.json @@ -1,5 +1,13 @@ [ { + "version": "0.4.1", + "changes": [ + { + "note": "Add support for solidity 0.4.22" + } + ] + }, + { "version": "0.4.0", "changes": [ { diff --git a/packages/deployer/package.json b/packages/deployer/package.json index d529382ac..d4882c932 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -6,7 +6,8 @@ "types": "lib/src/index.d.ts", "scripts": { "build:watch": "tsc -w", - "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", + "build": + "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "test": "run-s build run_mocha", "run_mocha": "mocha lib/test/*_test.js --bail --exit", "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", @@ -19,15 +20,14 @@ "docs:stage": "yarn build && node ./scripts/stage_docs.js", "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", - "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" + "upload_docs_json": + "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" }, "config": { "postpublish": { "assets": [], "docPublishConfigs": { - "extraFileIncludes": [ - "../types/src/index.ts" - ], + "extraFileIncludes": ["../types/src/index.ts"], "s3BucketPath": "s3://doc-jsons/deployer/", "s3StagingBucketPath": "s3://staging-doc-jsons/deployer/" } @@ -81,7 +81,7 @@ "lodash": "^4.17.4", "require-from-string": "^2.0.1", "semver": "^5.5.0", - "solc": "^0.4.18", + "solc": "^0.4.22", "web3": "^0.20.0", "web3-eth-abi": "^1.0.0-beta.24", "yargs": "^10.0.3" diff --git a/packages/deployer/src/solc/bin_paths.ts b/packages/deployer/src/solc/bin_paths.ts index 53086113a..9ac00ea9d 100644 --- a/packages/deployer/src/solc/bin_paths.ts +++ b/packages/deployer/src/solc/bin_paths.ts @@ -15,4 +15,5 @@ export const binPaths: BinaryPaths = { '0.4.19': 'soljson-v0.4.19+commit.c4cbbb05.js', '0.4.20': 'soljson-v0.4.20+commit.3155dd80.js', '0.4.21': 'soljson-v0.4.21+commit.dfe3193c.js', + '0.4.22': 'soljson-v0.4.22+commit.4cb486ee.js', }; |