aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-06-01 03:19:37 +0800
committerGitHub <noreply@github.com>2018-06-01 03:19:37 +0800
commit484fd68495bf921c57a09b413d978b028f0c80e8 (patch)
tree8896c8a35dfeee2f5b3d1daad38201ca087c99ea
parentc284f6dcd4e10388e0dd474be08788ddef6b4f30 (diff)
parent792be54443b72f18c725bda6bcb1c4b98c845666 (diff)
downloaddexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.tar
dexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.tar.gz
dexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.tar.bz2
dexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.tar.lz
dexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.tar.xz
dexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.tar.zst
dexon-sol-tools-484fd68495bf921c57a09b413d978b028f0c80e8.zip
Merge pull request #647 from 0xProject/override-ethereumjs-tx-version
Override ethereumjs-tx version
-rw-r--r--package.json3
-rw-r--r--yarn.lock14
2 files changed, 6 insertions, 11 deletions
diff --git a/package.json b/package.json
index f2d4058be..cdbc7a385 100644
--- a/package.json
+++ b/package.json
@@ -40,5 +40,8 @@
"npm-run-all": "^4.1.2",
"prettier": "^1.11.1",
"wsrun": "^2.2.0"
+ },
+ "resolutions": {
+ "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
}
}
diff --git a/yarn.lock b/yarn.lock
index 135fa9fff..eb1cad3cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -130,7 +130,7 @@
"@types/express" "*"
"@types/node" "*"
-"@types/compare-versions@^3.0.1":
+"@types/compare-versions@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/compare-versions/-/compare-versions-3.0.0.tgz#4a45dffe0ebbc00d0f2daef8a0e96ffc66cf5955"
@@ -237,10 +237,6 @@
dependencies:
jsonschema "*"
-"@types/lerna-get-packages@^1.0.0":
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/@types/lerna-get-packages/-/lerna-get-packages-1.0.0.tgz#d98269467207e17fb43ae76d78d1bcc2c9b76a34"
-
"@types/lodash.foreach@^4.5.3":
version "4.5.3"
resolved "https://registry.yarnpkg.com/@types/lodash.foreach/-/lodash.foreach-4.5.3.tgz#87c01a0c5d9d17eec936ca3c28897af79440cdfc"
@@ -404,10 +400,6 @@
"@types/glob" "*"
"@types/node" "*"
-"@types/semver-sort@^0.0.0":
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/@types/semver-sort/-/semver-sort-0.0.0.tgz#30b7bb8b954e9bd9b453b303a9a7a477204d3645"
-
"@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
@@ -4075,9 +4067,9 @@ ethereumjs-blockstream@^2.0.6:
source-map-support "0.4.14"
uuid "3.0.1"
-ethereumjs-tx@^1.0.0, ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.0, ethereumjs-tx@^1.3.3:
+ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default, ethereumjs-tx@^1.0.0, ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.0, ethereumjs-tx@^1.3.3:
version "1.3.4"
- resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.4.tgz#c2304912f6c07af03237ad8675ac036e290dad48"
+ resolved "https://codeload.github.com/0xProject/ethereumjs-tx/tar.gz/5f0a610849de09f922f8ccee5af1aae4bec36e51"
dependencies:
ethereum-common "^0.0.18"
ethereumjs-util "^5.0.0"