diff options
author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2019-01-12 00:53:15 +0800 |
---|---|---|
committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2019-01-12 00:53:15 +0800 |
commit | faee7513952a4b87d5f9e9dde9deb20126f58834 (patch) | |
tree | 8168000e484e621e1526cf48fb0f979a6d98d972 /packages/sol-compiler | |
parent | 742e5e039dd4e821209b5511fb6a194d11c6291c (diff) | |
parent | 2cf57a48dd2857dd5cf2f31f4c60dd47ae4d34a5 (diff) | |
download | dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.tar dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.tar.gz dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.tar.bz2 dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.tar.lz dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.tar.xz dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.tar.zst dexon-sol-tools-faee7513952a4b87d5f9e9dde9deb20126f58834.zip |
Merge branch 'development' into feature/instant/asset-buyer-check-liquidity
Diffstat (limited to 'packages/sol-compiler')
-rw-r--r-- | packages/sol-compiler/CHANGELOG.json | 19 | ||||
-rw-r--r-- | packages/sol-compiler/CHANGELOG.md | 6 | ||||
-rw-r--r-- | packages/sol-compiler/README.md | 10 | ||||
-rw-r--r-- | packages/sol-compiler/package.json | 18 | ||||
-rw-r--r-- | packages/sol-compiler/src/cli.ts | 4 | ||||
-rw-r--r-- | packages/sol-compiler/src/solc/bin_paths.ts | 59 |
6 files changed, 77 insertions, 39 deletions
diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 8548fd73f..246b298ab 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -9,8 +9,13 @@ { "note": "Make error and warning colouring more visually pleasant and consistent with other compilers", "pr": 1461 + }, + { + "note": "Add newest solidity versions from 0.4.25 to 0.5.2", + "pr": 1496 } - ] + ], + "timestamp": 1547040760 }, { "version": "1.1.16", @@ -161,8 +166,7 @@ "version": "1.1.0", "changes": [ { - "note": - "Quicken compilation by sending multiple contracts to the same solcjs invocation, batching them together based on compiler version requirements.", + "note": "Quicken compilation by sending multiple contracts to the same solcjs invocation, batching them together based on compiler version requirements.", "pr": 965 }, { @@ -376,8 +380,7 @@ "pr": 426 }, { - "note": - "Add `bytecode`, `runtime_bytecode`, `source_map`, `source_map_runtime` and `sources` fields to artifacts", + "note": "Add `bytecode`, `runtime_bytecode`, `source_map`, `source_map_runtime` and `sources` fields to artifacts", "pr": 426 }, { @@ -385,8 +388,7 @@ "pr": 426 }, { - "note": - "Allow deployer to accept a provider instead of port and host. This makes it possible to run it with in-process ganache-core", + "note": "Allow deployer to accept a provider instead of port and host. This makes it possible to run it with in-process ganache-core", "pr": 426 }, { @@ -407,8 +409,7 @@ "pr": 408 }, { - "note": - "Improve an error message for when deployer is supplied with an incorrect number of constructor arguments", + "note": "Improve an error message for when deployer is supplied with an incorrect number of constructor arguments", "pr": 419 } ], diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md index b2066448d..6ec804c3a 100644 --- a/packages/sol-compiler/CHANGELOG.md +++ b/packages/sol-compiler/CHANGELOG.md @@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.0 - _January 9, 2019_ + + * Add sol-compiler watch mode with -w flag (#1461) + * Make error and warning colouring more visually pleasant and consistent with other compilers (#1461) + * Add newest solidity versions from 0.4.25 to 0.5.2 (#1496) + ## v1.1.16 - _December 13, 2018_ * Dependencies updated diff --git a/packages/sol-compiler/README.md b/packages/sol-compiler/README.md index 445aea315..412a5fc02 100644 --- a/packages/sol-compiler/README.md +++ b/packages/sol-compiler/README.md @@ -2,11 +2,11 @@ Sol-compiler is a wrapper around [solc-js](https://www.npmjs.com/package/solc) that adds: -* Smart re-compilation: Only recompiles when smart contracts have changed -* Ability to compile an entire project instead of only individual `.sol` files -* Compilation using the Solidity version specified at the top of each individual `.sol` file -* Proper parsing of Solidity version ranges -* Support for the standard [input description](https://solidity.readthedocs.io/en/develop/using-the-compiler.html#input-description) for what information you'd like added to the resulting `artifacts` file (i.e 100% configurable artifacts content). +- Smart re-compilation: Only recompiles when smart contracts have changed +- Ability to compile an entire project instead of only individual `.sol` files +- Compilation using the Solidity version specified at the top of each individual `.sol` file +- Proper parsing of Solidity version ranges +- Support for the standard [input description](https://solidity.readthedocs.io/en/develop/using-the-compiler.html#input-description) for what information you'd like added to the resulting `artifacts` file (i.e 100% configurable artifacts content). ### Read the [Documentation](https://0xproject.com/docs/sol-compiler). diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 86167a603..6c9435bcd 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-compiler", - "version": "1.1.16", + "version": "2.0.0", "engines": { "node": ">=6.12" }, @@ -42,7 +42,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { - "@0x/dev-utils": "^1.0.21", + "@0x/dev-utils": "^1.0.22", "@0x/tslint-config": "^2.0.0", "@types/chokidar": "^1.7.5", "@types/mkdirp": "^0.5.2", @@ -67,13 +67,13 @@ "zeppelin-solidity": "1.8.0" }, "dependencies": { - "@0x/assert": "^1.0.20", - "@0x/json-schemas": "^2.1.4", - "@0x/sol-resolver": "^1.1.1", - "@0x/types": "^1.4.1", + "@0x/assert": "^1.0.21", + "@0x/json-schemas": "^2.1.5", + "@0x/sol-resolver": "^1.2.1", + "@0x/types": "^1.5.0", "@0x/typescript-typings": "^3.0.6", - "@0x/utils": "^2.0.8", - "@0x/web3-wrapper": "^3.2.1", + "@0x/utils": "^2.1.1", + "@0x/web3-wrapper": "^3.2.2", "@types/yargs": "^11.0.0", "chalk": "^2.3.0", "chokidar": "^2.0.4", @@ -84,7 +84,7 @@ "pluralize": "^7.0.0", "require-from-string": "^2.0.1", "semver": "5.5.0", - "solc": "^0.4.23", + "solc": "^0.5.2", "source-map-support": "^0.5.0", "web3-eth-abi": "^1.0.0-beta.24", "yargs": "^10.0.3" diff --git a/packages/sol-compiler/src/cli.ts b/packages/sol-compiler/src/cli.ts index 18cc68aaf..db0c09581 100644 --- a/packages/sol-compiler/src/cli.ts +++ b/packages/sol-compiler/src/cli.ts @@ -33,8 +33,8 @@ const SEPARATOR = ','; const contracts = _.isUndefined(argv.contracts) ? undefined : argv.contracts === DEFAULT_CONTRACTS_LIST - ? DEFAULT_CONTRACTS_LIST - : argv.contracts.split(SEPARATOR); + ? DEFAULT_CONTRACTS_LIST + : argv.contracts.split(SEPARATOR); const opts = { contractsDir: argv.contractsDir, artifactsDir: argv.artifactsDir, diff --git a/packages/sol-compiler/src/solc/bin_paths.ts b/packages/sol-compiler/src/solc/bin_paths.ts index a75255dc6..b653c0926 100644 --- a/packages/sol-compiler/src/solc/bin_paths.ts +++ b/packages/sol-compiler/src/solc/bin_paths.ts @@ -3,19 +3,50 @@ export interface BinaryPaths { } export const binPaths: BinaryPaths = { - '0.4.10': 'soljson-v0.4.10+commit.f0d539ae.js', - '0.4.11': 'soljson-v0.4.11+commit.68ef5810.js', - '0.4.12': 'soljson-v0.4.12+commit.194ff033.js', - '0.4.13': 'soljson-v0.4.13+commit.fb4cb1a.js', - '0.4.14': 'soljson-v0.4.14+commit.c2215d46.js', - '0.4.15': 'soljson-v0.4.15+commit.bbb8e64f.js', - '0.4.16': 'soljson-v0.4.16+commit.d7661dd9.js', - '0.4.17': 'soljson-v0.4.17+commit.bdeb9e52.js', - '0.4.18': 'soljson-v0.4.18+commit.9cf6e910.js', - '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', - '0.4.23': 'soljson-v0.4.23+commit.124ca40d.js', + '0.5.2': 'soljson-v0.5.2+commit.1df8f40c.js', + '0.5.1': 'soljson-v0.5.1+commit.c8a2cb62.js', + '0.5.0': 'soljson-v0.5.0+commit.1d4f565a.js', + '0.4.25': 'soljson-v0.4.25+commit.59dbf8f1.js', '0.4.24': 'soljson-v0.4.24+commit.e67f0147.js', + '0.4.23': 'soljson-v0.4.23+commit.124ca40d.js', + '0.4.22': 'soljson-v0.4.22+commit.4cb486ee.js', + '0.4.21': 'soljson-v0.4.21+commit.dfe3193c.js', + '0.4.20': 'soljson-v0.4.20+commit.3155dd80.js', + '0.4.19': 'soljson-v0.4.19+commit.c4cbbb05.js', + '0.4.18': 'soljson-v0.4.18+commit.9cf6e910.js', + '0.4.17': 'soljson-v0.4.17+commit.bdeb9e52.js', + '0.4.16': 'soljson-v0.4.16+commit.d7661dd9.js', + '0.4.15': 'soljson-v0.4.15+commit.bbb8e64f.js', + '0.4.14': 'soljson-v0.4.14+commit.c2215d46.js', + '0.4.13': 'soljson-v0.4.13+commit.fb4cb1a.js', + '0.4.12': 'soljson-v0.4.12+commit.194ff033.js', + '0.4.11': 'soljson-v0.4.11+commit.68ef5810.js', + '0.4.10': 'soljson-v0.4.10+commit.f0d539ae.js', + '0.4.9': 'soljson-v0.4.9+commit.364da425.js', + '0.4.8': 'soljson-v0.4.8+commit.60cc1668.js', + '0.4.7': 'soljson-v0.4.7+commit.822622cf.js', + '0.4.6': 'soljson-v0.4.6+commit.2dabbdf0.js', + '0.4.5': 'soljson-v0.4.5+commit.b318366e.js', + '0.4.4': 'soljson-v0.4.4+commit.4633f3de.js', + '0.4.3': 'soljson-v0.4.3+commit.2353da71.js', + '0.4.2': 'soljson-v0.4.2+commit.af6afb04.js', + '0.4.1': 'soljson-v0.4.1+commit.4fc6fc2c.js', + '0.4.0': 'soljson-v0.4.0+commit.acd334c9.js', + '0.3.6': 'soljson-v0.3.6+commit.3fc68da.js', + '0.3.5': 'soljson-v0.3.5+commit.5f97274.js', + '0.3.4': 'soljson-v0.3.4+commit.7dab890.js', + '0.3.3': 'soljson-v0.3.3+commit.4dc1cb1.js', + '0.3.2': 'soljson-v0.3.2+commit.81ae2a7.js', + '0.3.1': 'soljson-v0.3.1+commit.c492d9b.js', + '0.3.0': 'soljson-v0.3.0+commit.11d6736.js', + '0.2.2': 'soljson-v0.2.2+commit.ef92f56.js', + '0.2.1': 'soljson-v0.2.1+commit.91a6b35.js', + '0.2.0': 'soljson-v0.2.0+commit.4dc2445.js', + '0.1.7': 'soljson-v0.1.7+commit.b4e666c.js', + '0.1.6': 'soljson-v0.1.6+commit.d41f8b7.js', + '0.1.5': 'soljson-v0.1.5+commit.23865e3.js', + '0.1.4': 'soljson-v0.1.4+commit.5f6c3cd.js', + '0.1.3': 'soljson-v0.1.3+commit.28f561.js', + '0.1.2': 'soljson-v0.1.2+commit.d0d36e3.js', + '0.1.1': 'soljson-v0.1.1+commit.6ff4cd6.js', }; |