aboutsummaryrefslogtreecommitdiffstats
path: root/yarn.lock
diff options
context:
space:
mode:
authorFrancesco Agosti <francesco.agosti93@gmail.com>2018-10-24 08:00:54 +0800
committerGitHub <noreply@github.com>2018-10-24 08:00:54 +0800
commit4a72dc6c6f0825232d61e470f5b7975aec2e5c0e (patch)
treefe6a9ee3ebe2c3a3aa21931261eca3c91f8072d7 /yarn.lock
parent2110ac32b7fceb230467ae0e2bb2bcd5e582f25f (diff)
parent864f89c535cf68a9325f27eae7f49a088c481120 (diff)
downloaddexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.tar
dexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.tar.gz
dexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.tar.bz2
dexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.tar.lz
dexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.tar.xz
dexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.tar.zst
dexon-sol-tools-4a72dc6c6f0825232d61e470f5b7975aec2e5c0e.zip
Merge pull request #1159 from 0xProject/feature/instant/beta-render-et-al
[instant] Pass in liquiditySource, assetData and other settings from render
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock12
1 files changed, 6 insertions, 6 deletions
diff --git a/yarn.lock b/yarn.lock
index a49282db9..f0064bff1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1871,7 +1871,7 @@ aes-js@^0.2.3:
aes-js@^3.1.1:
version "3.1.1"
- resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.1.tgz#89fd1f94ae51b4c72d62466adc1a7323ff52f072"
+ resolved "https://registry.npmjs.org/aes-js/-/aes-js-3.1.1.tgz#89fd1f94ae51b4c72d62466adc1a7323ff52f072"
agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
version "4.2.1"
@@ -3328,7 +3328,7 @@ bs58check@^1.0.8:
bs58check@^2.1.2:
version "2.1.2"
- resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
+ resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
dependencies:
bs58 "^4.0.0"
create-hash "^1.1.0"
@@ -5915,7 +5915,7 @@ ethereumjs-wallet@0.6.0:
ethereumjs-wallet@~0.6.0:
version "0.6.2"
- resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
+ resolved "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
dependencies:
aes-js "^3.1.1"
bs58check "^2.1.2"
@@ -6730,7 +6730,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
ethereumjs-util "^5.2.0"
ethereumjs-vm "2.3.5"
- ethereumjs-wallet "0.6.0"
+ ethereumjs-wallet "~0.6.0"
fake-merkle-patricia-tree "~1.0.1"
heap "~0.2.6"
js-scrypt "^0.2.0"
@@ -7457,7 +7457,7 @@ hdkey@^0.7.0, hdkey@^0.7.1:
hdkey@^1.0.0:
version "1.1.0"
- resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
+ resolved "https://registry.npmjs.org/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
dependencies:
coinstring "^2.0.0"
safe-buffer "^5.1.1"
@@ -15548,7 +15548,7 @@ utf8@^2.1.1:
utf8@^3.0.0:
version "3.0.0"
- resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
+ resolved "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
util-deprecate@~1.0.1:
version "1.0.2"