From 8ca5dc0d705c5155cb5e6901e5172562a966b482 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 25 Jun 2018 09:36:13 +0200 Subject: [PATCH] Update dependencies, onClose connect --- package.json | 2 +- packages/api-format/package.json | 8 +- packages/api-provider/package.json | 8 +- packages/api-provider/src/ws/onClose.ts | 5 +- packages/api/package.json | 6 +- yarn.lock | 168 ++++++++++++------------ 6 files changed, 99 insertions(+), 98 deletions(-) diff --git a/package.json b/package.json index dec2b16aa4..8a91324b95 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,6 @@ }, "devDependencies": { "@polkadot/dev": "^0.20.3", - "@polkadot/ts": "^0.0.26" + "@polkadot/ts": "^0.1.1" } } diff --git a/packages/api-format/package.json b/packages/api-format/package.json index f68e5f9658..b95d0829bd 100644 --- a/packages/api-format/package.json +++ b/packages/api-format/package.json @@ -35,9 +35,9 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/jsonrpc": "^0.19.4", - "@polkadot/primitives-json": "^0.19.4", - "@polkadot/util": "^0.24.5", - "@polkadot/util-keyring": "^0.24.5" + "@polkadot/jsonrpc": "^0.19.5", + "@polkadot/primitives-json": "^0.19.5", + "@polkadot/util": "^0.24.6", + "@polkadot/util-keyring": "^0.24.6" } } diff --git a/packages/api-provider/package.json b/packages/api-provider/package.json index 62ba634515..82f964b3bf 100644 --- a/packages/api-provider/package.json +++ b/packages/api-provider/package.json @@ -39,10 +39,10 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/storage": "^0.19.4", - "@polkadot/util": "^0.24.5", - "@polkadot/util-crypto": "^0.24.5", - "@polkadot/util-keyring": "^0.24.5", + "@polkadot/storage": "^0.19.5", + "@polkadot/util": "^0.24.6", + "@polkadot/util-crypto": "^0.24.6", + "@polkadot/util-keyring": "^0.24.6", "@types/nock": "^9.1.3", "eventemitter3": "^2.0.3", "isomorphic-fetch": "^2.2.1", diff --git a/packages/api-provider/src/ws/onClose.ts b/packages/api-provider/src/ws/onClose.ts index e056474f60..ab01805111 100644 --- a/packages/api-provider/src/ws/onClose.ts +++ b/packages/api-provider/src/ws/onClose.ts @@ -4,6 +4,8 @@ import { WsState } from './types'; +import connect from './connect'; + export default function onClose (self: WsState): () => void { return (): void => { self.l.debug(() => ['disconnected from', self.endpoint]); @@ -13,8 +15,7 @@ export default function onClose (self: WsState): () => void { if (self.autoConnect) { setTimeout(() => { - // FIXME: This is a circular dependency - require('./connect')(self); + connect(self); }, 1000); } }; diff --git a/packages/api/package.json b/packages/api/package.json index 93f11e4f68..d777dd870e 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -37,8 +37,8 @@ "@babel/runtime": "^7.0.0-beta.51", "@polkadot/api-format": "^0.14.4", "@polkadot/api-provider": "^0.14.4", - "@polkadot/jsonrpc": "^0.19.4", - "@polkadot/params": "^0.19.4", - "@polkadot/util": "^0.24.5" + "@polkadot/jsonrpc": "^0.19.5", + "@polkadot/params": "^0.19.5", + "@polkadot/util": "^0.24.6" } } diff --git a/yarn.lock b/yarn.lock index 7e79494f66..6f57f782d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -734,137 +734,137 @@ rimraf "^2.6.2" typescript "^2.9.2" -"@polkadot/extrinsics-codec@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics-codec/-/extrinsics-codec-0.19.4.tgz#afb14f482d520647f90d3ef0b4485d158e0c3f3c" +"@polkadot/extrinsics-codec@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/extrinsics-codec/-/extrinsics-codec-0.19.5.tgz#74c794b3caa696764be41b6a4317e3720bc11de3" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/extrinsics" "^0.19.4" - "@polkadot/params" "^0.19.4" - "@polkadot/util" "^0.24.5" - "@polkadot/util-keyring" "^0.24.5" + "@polkadot/extrinsics" "^0.19.5" + "@polkadot/params" "^0.19.5" + "@polkadot/util" "^0.24.6" + "@polkadot/util-keyring" "^0.24.6" bn.js "^4.11.8" -"@polkadot/extrinsics@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.19.4.tgz#fcd43619280d17d47c366d237f4e2da0b323dbeb" +"@polkadot/extrinsics@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.19.5.tgz#da7f25e3741354f0858c7b3bcfea6cc0ab646383" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/params" "^0.19.4" - "@polkadot/primitives" "^0.19.4" - "@polkadot/util" "^0.24.5" + "@polkadot/params" "^0.19.5" + "@polkadot/primitives" "^0.19.5" + "@polkadot/util" "^0.24.6" -"@polkadot/jsonrpc@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.19.4.tgz#26d32ec05ec7d5f6369ce78c00422cecf500a827" +"@polkadot/jsonrpc@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.19.5.tgz#7d7c9a36425812644f5cc469791e1b714956827c" dependencies: - "@polkadot/params" "^0.19.4" + "@polkadot/params" "^0.19.5" babel-runtime "^6.26.0" -"@polkadot/params@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.19.4.tgz#0300e169ca6ab4129eeb20d4c0e41237abdcdf4d" +"@polkadot/params@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.19.5.tgz#ecfb93a5696e9d9423412a033897adcc18a8342c" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/extrinsics" "^0.19.4" - "@polkadot/extrinsics-codec" "^0.19.4" - "@polkadot/primitives" "^0.19.4" - "@polkadot/util" "^0.24.5" + "@polkadot/extrinsics" "^0.19.5" + "@polkadot/extrinsics-codec" "^0.19.5" + "@polkadot/primitives" "^0.19.5" + "@polkadot/util" "^0.24.6" -"@polkadot/primitives-builder@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.19.4.tgz#f701267db4d2f9343b02bd77f685f3a2f8b1b2e0" +"@polkadot/primitives-builder@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.19.5.tgz#55330d20ed3924bfe23d951d8490cb2303577a5b" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/extrinsics-codec" "^0.19.4" - "@polkadot/primitives" "^0.19.4" - "@polkadot/primitives-codec" "^0.19.4" - "@polkadot/util" "^0.24.5" - "@polkadot/util-crypto" "^0.24.5" - "@polkadot/util-triehash" "^0.24.5" + "@polkadot/extrinsics-codec" "^0.19.5" + "@polkadot/primitives" "^0.19.5" + "@polkadot/primitives-codec" "^0.19.5" + "@polkadot/util" "^0.24.6" + "@polkadot/util-crypto" "^0.24.6" + "@polkadot/util-triehash" "^0.24.6" -"@polkadot/primitives-codec@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.19.4.tgz#a65c11746be5ba203654406e1537e45f6c9aee65" +"@polkadot/primitives-codec@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.19.5.tgz#91649d66b212bb6f11ff466908f1b43006df8db5" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/primitives" "^0.19.4" - "@polkadot/primitives-builder" "^0.19.4" - "@polkadot/util" "^0.24.5" - "@polkadot/util-crypto" "^0.24.5" - "@polkadot/util-keyring" "^0.24.5" + "@polkadot/primitives" "^0.19.5" + "@polkadot/primitives-builder" "^0.19.5" + "@polkadot/util" "^0.24.6" + "@polkadot/util-crypto" "^0.24.6" + "@polkadot/util-keyring" "^0.24.6" -"@polkadot/primitives-json@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.19.4.tgz#41540a42577e36b78f357b57075104d599e78407" +"@polkadot/primitives-json@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.19.5.tgz#452b6827e7f707211cd786b8a1362686a0cf27aa" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/primitives" "^0.19.4" - "@polkadot/primitives-builder" "^0.19.4" - "@polkadot/util" "^0.24.5" + "@polkadot/primitives" "^0.19.5" + "@polkadot/primitives-builder" "^0.19.5" + "@polkadot/util" "^0.24.6" -"@polkadot/primitives@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.19.4.tgz#7506f2c17f237b7d16e45122f7c7cf56c21262bb" +"@polkadot/primitives@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.19.5.tgz#730b3750fe21bf84b7ef00b71aa72ebeb0138ce3" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/util" "^0.24.5" + "@polkadot/util" "^0.24.6" -"@polkadot/storage@^0.19.4": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.19.4.tgz#dc4574a5bfe37fd37010ccce8a8771c933d50b14" +"@polkadot/storage@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.19.5.tgz#375a5a98718b24941a198f7e1833a62b7830ef22" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/params" "^0.19.4" - "@polkadot/primitives" "^0.19.4" - "@polkadot/util" "^0.24.5" - "@polkadot/util-crypto" "^0.24.5" - "@polkadot/util-keyring" "^0.24.5" + "@polkadot/params" "^0.19.5" + "@polkadot/primitives" "^0.19.5" + "@polkadot/util" "^0.24.6" + "@polkadot/util-crypto" "^0.24.6" + "@polkadot/util-keyring" "^0.24.6" -"@polkadot/ts@^0.0.26": - version "0.0.26" - resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.0.26.tgz#d02871c5671ba410cd6262af959b19d572c4fba4" +"@polkadot/ts@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.1.tgz#8fdf79ae370f683dabae646ee1f34cd8eaa32014" -"@polkadot/util-crypto@^0.24.5": - version "0.24.5" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.24.5.tgz#fcc230fbff64629bdd653efb4f04ed9ec3bebb14" +"@polkadot/util-crypto@^0.24.6": + version "0.24.6" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.24.6.tgz#e2531b94ada135898e144a3c528787c7015dd13f" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/util" "^0.24.5" + "@polkadot/util" "^0.24.6" blakejs "^1.1.0" js-sha3 "^0.7.0" tweetnacl "^1.0.0" xxhashjs "^0.2.2" -"@polkadot/util-keyring@^0.24.5": - version "0.24.5" - resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.24.5.tgz#f447df73e59012d4248d42f8196113f2bf0d723e" +"@polkadot/util-keyring@^0.24.6": + version "0.24.6" + resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.24.6.tgz#86f05fa3009c201fda14b131b3157cfa8e28e07b" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/util" "^0.24.5" - "@polkadot/util-crypto" "^0.24.5" + "@polkadot/util" "^0.24.6" + "@polkadot/util-crypto" "^0.24.6" "@types/bs58" "^3.0.30" bs58 "^4.0.1" -"@polkadot/util-rlp@^0.24.5": - version "0.24.5" - resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.24.5.tgz#fc4c1eb850331cc80ad3f6748d3b3fa36f8315b5" +"@polkadot/util-rlp@^0.24.6": + version "0.24.6" + resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.24.6.tgz#c0dd96e81b242f913f06538815ecb56959b0cdff" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/util" "^0.24.5" + "@polkadot/util" "^0.24.6" -"@polkadot/util-triehash@^0.24.5": - version "0.24.5" - resolved "https://registry.yarnpkg.com/@polkadot/util-triehash/-/util-triehash-0.24.5.tgz#508fcf6514394e3837fc65afe9916b60bd8f47a5" +"@polkadot/util-triehash@^0.24.6": + version "0.24.6" + resolved "https://registry.yarnpkg.com/@polkadot/util-triehash/-/util-triehash-0.24.6.tgz#0fe7578d53698b5eb35c6da5e26fd97fb926a9ef" dependencies: "@babel/runtime" "^7.0.0-beta.51" - "@polkadot/util" "^0.24.5" - "@polkadot/util-crypto" "^0.24.5" - "@polkadot/util-rlp" "^0.24.5" + "@polkadot/util" "^0.24.6" + "@polkadot/util-crypto" "^0.24.6" + "@polkadot/util-rlp" "^0.24.6" -"@polkadot/util@^0.24.5": - version "0.24.5" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.24.5.tgz#346e7d3244dbd92b1715b45e2bdf0278b206de58" +"@polkadot/util@^0.24.6": + version "0.24.6" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.24.6.tgz#e7da40873ac4445f892ca842e9ef58c735ea6832" dependencies: "@babel/runtime" "^7.0.0-beta.51" "@types/deasync" "^0.1.0"