aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:55:49 +0800
committerGitHub <noreply@github.com>2018-04-21 04:55:49 +0800
commitd08bfbf7054d0d98680daab3d1fdc0ac878dcc16 (patch)
tree4b301a5b3caffe8ada61af312620a0557feb7ea4
parent0046a0762cdfc0e733f460545ad62f5e4727eeb3 (diff)
parenta10e466fedaf1d291d24931f1743bb6becd101db (diff)
downloaddexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.tar
dexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.tar.gz
dexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.tar.bz2
dexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.tar.lz
dexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.tar.xz
dexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.tar.zst
dexon-0x-contracts-d08bfbf7054d0d98680daab3d1fdc0ac878dcc16.zip
Merge pull request #545 from 0xProject/feature/deployer/solidity-0.4.23
Feature/deployer/solidity 0.4.23
-rw-r--r--packages/contract_templates/partials/tx.handlebars2
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/deployer/CHANGELOG.json9
-rw-r--r--packages/deployer/package.json2
-rw-r--r--packages/deployer/src/solc/bin_paths.ts1
-rw-r--r--yarn.lock6
6 files changed, 16 insertions, 6 deletions
diff --git a/packages/contract_templates/partials/tx.handlebars b/packages/contract_templates/partials/tx.handlebars
index 22fe0c597..1bdf80c42 100644
--- a/packages/contract_templates/partials/tx.handlebars
+++ b/packages/contract_templates/partials/tx.handlebars
@@ -52,7 +52,7 @@ public {{this.tsName}} = {
const self = this as any as {{contractName}}Contract;
const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
[{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
- const abiEncodedTransactionData = self._lookupEthersInterface('{{this.name}}').functions.{{this.name}}(
+ const abiEncodedTransactionData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
{{> params inputs=inputs}}
).data;
return abiEncodedTransactionData;
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 1c22b2bec..30867476f 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -54,7 +54,7 @@
"npm-run-all": "^4.1.2",
"prettier": "^1.11.1",
"shx": "^0.2.2",
- "solc": "^0.4.22",
+ "solc": "^0.4.23",
"tslint": "5.8.0",
"typescript": "2.7.1",
"yargs": "^10.0.3"
diff --git a/packages/deployer/CHANGELOG.json b/packages/deployer/CHANGELOG.json
index 6185aa7ce..943d4a6f5 100644
--- a/packages/deployer/CHANGELOG.json
+++ b/packages/deployer/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "0.4.2",
+ "changes": [
+ {
+ "note": "Add support for solidity 0.4.23",
+ "pr": 545
+ }
+ ]
+ },
+ {
"version": "0.4.1",
"changes": [
{
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index 5e855e393..2d5538c97 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -81,7 +81,7 @@
"lodash": "^4.17.4",
"require-from-string": "^2.0.1",
"semver": "^5.5.0",
- "solc": "^0.4.22",
+ "solc": "^0.4.23",
"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 9ac00ea9d..1b5e8c6f1 100644
--- a/packages/deployer/src/solc/bin_paths.ts
+++ b/packages/deployer/src/solc/bin_paths.ts
@@ -16,4 +16,5 @@ export const binPaths: BinaryPaths = {
'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',
};
diff --git a/yarn.lock b/yarn.lock
index a62d48512..be72ead11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9664,9 +9664,9 @@ 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"
+solc@^0.4.23:
+ version "0.4.23"
+ resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.23.tgz#54a0ff4015827b32fddb62c0a418b5247310a58e"
dependencies:
fs-extra "^0.30.0"
memorystream "^0.3.1"