diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-02-07 08:26:35 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-02-07 08:26:35 +0800 |
| commit | 4c9c4c487a034d926443eeb8a0154fd38c97aca3 (patch) | |
| tree | b0d0f2a5d225097335733a3e37871f9c32551aa5 /yarn.lock | |
| parent | c172b9e0800dd9ed959b03e7ee418b9787c70c38 (diff) | |
| parent | 562bcb85710c281d817c7dd4957f0a7db1ddc306 (diff) | |
| download | dexon-0x-contracts-4c9c4c487a034d926443eeb8a0154fd38c97aca3.tar.gz dexon-0x-contracts-4c9c4c487a034d926443eeb8a0154fd38c97aca3.tar.zst dexon-0x-contracts-4c9c4c487a034d926443eeb8a0154fd38c97aca3.zip | |
Merge branch 'development' of github.com:0xProject/0x.js into development
* 'development' of github.com:0xProject/0x.js:
Bump subproviders version
Update yarn.lock
Change rpcUrls keys back into string literals
Add types-bn package to 0x.js and testnet-faucets
Prettier
Addressed comments and update 0xProject/types-ethereumjs-util deps
Prettier
Update testnet-faucets README
Fix lint errors
Add order signing and dispensing ability to faucet
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -9113,13 +9113,20 @@ types-bn@^0.0.1: dependencies: bn.js "4.11.7" -types-ethereumjs-util@0xproject/types-ethereumjs-util: - version "0.0.6" - resolved "https://codeload.github.com/0xproject/types-ethereumjs-util/tar.gz/0c5058e4f9d6585f7c7c1f88939546acb14323b8" +"types-bn@https://github.com/machinomy/types-bn.git": + version "0.0.1" + resolved "https://github.com/machinomy/types-bn.git#08ede69e138640d332b0dae0dc2e2fffee5f7160" + dependencies: + bn.js "4.11.7" + +types-ethereumjs-util@0xProject/types-ethereumjs-util: + version "0.0.7" + resolved "https://codeload.github.com/0xProject/types-ethereumjs-util/tar.gz/72722fc605bfa7f87ec4a959956b387320479ffc" dependencies: bn.js "^4.11.7" buffer "^5.0.6" rlp "^2.0.0" + types-bn "https://github.com/machinomy/types-bn.git" typescript@2.4.1: version "2.4.1" |