diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
| commit | 15ce862334be14a7effcd55840ca96e425912df8 (patch) | |
| tree | b51f48dfb6a0dc66745b62521c108472210dcfaa /yarn.lock | |
| parent | 72a00ac2df47ff793d74c2a82c7f403f501e784a (diff) | |
| parent | da0af12834b16c960d9ebf2936eec450825ba987 (diff) | |
| download | dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.gz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.bz2 dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.lz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.xz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.zst dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.zip | |
Merge branch 'development' into fix/refactorDocs
* development: (30 commits)
Export TransactionOpts type
Make website private
Publish
Update CHANGELOG
Change interval to 1h
Rename
Add ifExists to cleanupJobInterval
Add a cleanup job to an order watcher
Improve the comment
Add CHANGELOG comment
Add a HACK comment
Normalise subprovider names
Remove a comment
Fix a typo
Pin testrpc version
Remove gas params from tests
Add fake gas estimate suprovider for tests
Revert "Fix website linter errors"
Fix website linter errors
Fix tests
...
# Conflicts:
# packages/website/ts/utils/constants.ts
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -6,6 +6,10 @@ version "0.4.1" resolved "https://registry.yarnpkg.com/@types/accounting/-/accounting-0.4.1.tgz#865d9f5694fd7c438fba34eb4bc82eec6f34cdd5" +"@types/bintrees@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/bintrees/-/bintrees-1.0.2.tgz#0dfdce4eeebdf90427bd35b0e79dc248b3d157a6" + "@types/dateformat@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-1.0.1.tgz#2e5b235c8c55652c4fec284506d2a36fe65fe87e" @@ -18,10 +22,6 @@ version "5.12.2" resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-5.12.2.tgz#8c96517ff74303031c65c5da2d99858e34c844d2" -"@types/bintrees@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/bintrees/-/bintrees-1.0.2.tgz#0dfdce4eeebdf90427bd35b0e79dc248b3d157a6" - "@types/fs-extra@^4.0.0": version "4.0.5" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.5.tgz#8aa6033c0e87c653b09a6711686916864b48ec9e" @@ -2888,9 +2888,9 @@ ethereumjs-blockstream@^2.0.6: source-map-support "0.4.14" uuid "3.0.1" -ethereumjs-testrpc@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-4.0.1.tgz#af23babff4c36008418bc6de4c80f81606896cad" +ethereumjs-testrpc@6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-6.0.3.tgz#7a0b87bf3670f92f607f98fa6a78801d9741b124" dependencies: webpack "^3.0.0" |