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

Revert "Temporarily use forked version of truffle-contract to reduce the bundle"

Browse Source 
This reverts commit ef96c58b7f.
truffle-contract is not compatible with web3 0.19.0 cause it checks the
number of arguments and they pass incorrect number of arguments
This commit is contained in:
Leonid Logvinov
2017-06-21 15:14:28 +02:00
parent 41e62d078f
commit de29c23ad7
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -95,7 +95,7 @@
"jsonschema": "^1.1.1",
"lodash": "^4.17.4",
"publish-release": "^1.3.3",
"truffle-contract": "0xproject/truffle-contract#temporary",
"truffle-contract": "^2.0.1",
"web3": "^0.19.0"
}
}

24
yarn.lock
View File

@@ -4226,11 +4226,11 @@ trim@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
truffle-blockchain-utils@0xproject/truffle-blockchain-utils:
truffle-blockchain-utils@0.0.1:
version "0.0.1"
resolved "https://codeload.github.com/0xproject/truffle-blockchain-utils/tar.gz/edf5c512d70aa0fc7a7ce26b25a108ae005af9d8"
resolved "https://registry.yarnpkg.com/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.1.tgz#07a58e55bb0555a64208c9119c0b04ffe1464aa4"
dependencies:
web3 "^0.19.0"
web3 "^0.18.0"
truffle-contract-schema@0.0.5:
version "0.0.5"
@@ -4238,14 +4238,14 @@ truffle-contract-schema@0.0.5:
dependencies:
crypto-js "^3.1.9-1"
truffle-contract@0xproject/truffle-contract#temporary:
truffle-contract@^2.0.1:
version "2.0.1"
resolved "https://codeload.github.com/0xproject/truffle-contract/tar.gz/e105b90c4b388e56e38450b174fb6976e597fa30"
resolved "https://registry.yarnpkg.com/truffle-contract/-/truffle-contract-2.0.1.tgz#f83e3f18d8044027f2a9ee7c33767ba10fd39dd8"
dependencies:
ethjs-abi "0.1.8"
truffle-blockchain-utils "0xproject/truffle-blockchain-utils"
truffle-blockchain-utils "0.0.1"
truffle-contract-schema "0.0.5"
web3 "^0.19.0"
web3 "^0.18.0"
tslib@^1.7.1:
version "1.7.1"
@@ -4482,6 +4482,16 @@ web3@^0.16.0, web3@~0.16.0:
utf8 "^2.1.1"
xmlhttprequest "*"
web3@^0.18.0:
version "0.18.4"
resolved "https://registry.yarnpkg.com/web3/-/web3-0.18.4.tgz#81ec1784145491f2eaa8955b31c06049e07c5e7d"
dependencies:
bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
crypto-js "^3.1.4"
utf8 "^2.1.1"
xhr2 "*"
xmlhttprequest "*"
web3@^0.19.0:
version "0.19.0"
resolved "https://registry.yarnpkg.com/web3/-/web3-0.19.0.tgz#8b18fba24421a59d2884859bcb9b718c2665524e"