diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-13 22:10:05 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-13 22:10:05 +0800 |
| commit | b4fead9606ecc9655b2038fcef1c75217752f67d (patch) | |
| tree | b363eee11085850328837004b41ff23c5d31efb6 /packages/sol-compiler | |
| parent | 61243b418e4d962cd8d8a1d7a49f04510b3c1c7f (diff) | |
| parent | 4efd28c092e74b438d0397069c0c55cc90c537f2 (diff) | |
| download | dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.tar dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.tar.gz dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.tar.bz2 dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.tar.lz dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.tar.xz dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.tar.zst dexon-sol-tools-b4fead9606ecc9655b2038fcef1c75217752f67d.zip | |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype: (26 commits)
Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider
Refactor sol-cov to de-duplicate code for coverage and profiling
Rename popByte and popAddress
Hard code test addresses/bytes32 instead of generating pseudorandom ones
Update artifacts
Rename computeCoverageAsync -> computeSingleTraceCoverageAsync
Fix linter errors
Refactor sol-cov to avoid keeping traceInfo in memory
Unpop byte rather than making deep copy
Pass gas in to marketBuyOrdersNoThrow
Looks up the memory location of makerAssetData/takerAssetData
Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA
Add tests for deepCopyBytes and missing write methods from LibBytes
Pop id from assetData before dispatching to AssetProxies
Upgrade solidity-parser-entlr 0.2.11 => 0.2.12
Fix import order
Fix typos
Add CHANGELOGs
Speed-up sol-cov
Increase delay when sending transactions during devnet startup
...
Diffstat (limited to 'packages/sol-compiler')
| -rw-r--r-- | packages/sol-compiler/src/schemas/compiler_options_schema.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/sol-compiler/src/schemas/compiler_options_schema.ts b/packages/sol-compiler/src/schemas/compiler_options_schema.ts index 43a9c0879..d4d1b6017 100644 --- a/packages/sol-compiler/src/schemas/compiler_options_schema.ts +++ b/packages/sol-compiler/src/schemas/compiler_options_schema.ts @@ -3,7 +3,7 @@ export const compilerOptionsSchema = { properties: { contractsDir: { type: 'string' }, artifactsDir: { type: 'string' }, - solcVersion: { type: 'string', pattern: '^d+.d+.d+$' }, + solcVersion: { type: 'string', pattern: '^\\d+.\\d+.\\d+$' }, compilerSettings: { type: 'object' }, contracts: { oneOf: [ |