crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #531 from 0xProject/feature/deployer/solidity-0.4.22

Browse Source 
Solidity 0.4.22
This commit is contained in:
Jacob Evans
2018-04-18 16:21:56 +10:00
committed by GitHub
parent 12d5c35d14 a71e511f82
commit 823f2db09f
7 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/package.json
View File

@@ -54,7 +54,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"

9
packages/deployer/CHANGELOG.json
View File

@@ -1,4 +1,13 @@
[
{
"version": "0.4.1",
"changes": [
{
"note": "Add support for solidity 0.4.22",
"pr": 531
}
]
},
{
"version": "0.4.0",
"changes": [

2
packages/deployer/package.json
View File

@@ -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"

1
packages/deployer/src/solc/bin_paths.ts
View File

@@ -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',
};

14
packages/deployer/test/compiler_utils_test.ts
View File

@@ -1,5 +1,6 @@
import * as chai from 'chai';
import * as dirtyChai from 'dirty-chai';
import * as _ from 'lodash';
import 'mocha';
import {
@@ -51,11 +52,16 @@ describe('Compiler utils', () => {
const source = await fsWrapper.readFileAsync(path, {
encoding: 'utf8',
});
expect(parseDependencies({ source, path })).to.be.deep.equal([
const dependencies = parseDependencies({ source, path });
const expectedDependencies = [
'zeppelin-solidity/contracts/token/ERC20/ERC20.sol',
'/home/circleci/repo/packages/deployer/lib/test/fixtures/contracts/TokenTransferProxy.sol',
'/home/circleci/repo/packages/deployer/lib/test/fixtures/contracts/base/SafeMath.sol',
]);
'packages/deployer/lib/test/fixtures/contracts/TokenTransferProxy.sol',
'packages/deployer/lib/test/fixtures/contracts/base/SafeMath.sol',
];
_.each(expectedDependencies, expectedDepdency => {
const foundDependency = _.find(dependencies, dependency => _.endsWith(dependency, expectedDepdency));
expect(foundDependency, `${expectedDepdency} not found`).to.not.be.undefined();
});
});
it('correctly parses TokenTransferProxy dependencies', async () => {
const path = `${__dirname}/fixtures/contracts/TokenTransferProxy.sol`;

2
packages/deployer/test/fixtures/exchange_bin.ts vendored
View File

File diff suppressed because one or more lines are too long

10
yarn.lock
View File

@@ -9621,6 +9621,16 @@ solc@^0.4.18, solc@^0.4.2:
semver "^5.3.0"
yargs "^4.7.1"
solc@^0.4.22:
version "0.4.22"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.22.tgz#bbb879e4bc371604158430130a978f43f55ee48a"
dependencies:
fs-extra "^0.30.0"
memorystream "^0.3.1"
require-from-string "^1.1.0"
semver "^5.3.0"
yargs "^4.7.1"
solidity-parser-antlr@^0.2.8:
version "0.2.8"
resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.2.8.tgz#8eb8547a88dfeaf6cf4c7811e3824084214244d4"