From fb377fb0d42a42c7d36e732d5af9a78b9331bf25 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 26 Oct 2020 22:36:03 +0100 Subject: [PATCH] Adjust index WS imports (#2785) --- packages/api-contract/package.json | 2 +- packages/api-derive/package.json | 6 +- packages/api/package.json | 8 +-- packages/api/src/index.ts | 2 +- packages/metadata/package.json | 6 +- packages/rpc-core/package.json | 4 +- packages/rpc-provider/package.json | 6 +- packages/rpc-provider/src/ws/errors.ts | 4 +- packages/typegen/package.json | 2 +- packages/types-known/package.json | 2 +- packages/types/package.json | 6 +- yarn.lock | 89 +++++++++++++------------- 12 files changed, 68 insertions(+), 69 deletions(-) diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index e26cb522d7..a622d0d57e 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -30,7 +30,7 @@ "@polkadot/api": "^2.4.2-0", "@polkadot/rpc-core": "^2.4.2-0", "@polkadot/types": "^2.4.2-0", - "@polkadot/util": "^3.6.1", + "@polkadot/util": "^3.6.2-5", "bn.js": "^5.1.3", "rxjs": "^6.6.3" } diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 60e90ecc50..c301d475c6 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -32,13 +32,13 @@ "@polkadot/rpc-core": "^2.4.2-0", "@polkadot/rpc-provider": "^2.4.2-0", "@polkadot/types": "^2.4.2-0", - "@polkadot/util": "^3.6.1", - "@polkadot/util-crypto": "^3.6.1", + "@polkadot/util": "^3.6.2-5", + "@polkadot/util-crypto": "^3.6.2-5", "bn.js": "^5.1.3", "memoizee": "^0.4.14", "rxjs": "^6.6.3" }, "devDependencies": { - "@polkadot/keyring": "^3.6.1" + "@polkadot/keyring": "^3.6.2-5" } } diff --git a/packages/api/package.json b/packages/api/package.json index 1b2d4e49a2..8fccb578c9 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -28,19 +28,19 @@ "dependencies": { "@babel/runtime": "^7.12.1", "@polkadot/api-derive": "^2.4.2-0", - "@polkadot/keyring": "^3.6.1", + "@polkadot/keyring": "^3.6.2-5", "@polkadot/metadata": "^2.4.2-0", "@polkadot/rpc-core": "^2.4.2-0", "@polkadot/rpc-provider": "^2.4.2-0", "@polkadot/types": "^2.4.2-0", "@polkadot/types-known": "^2.4.2-0", - "@polkadot/util": "^3.6.1", - "@polkadot/util-crypto": "^3.6.1", + "@polkadot/util": "^3.6.2-5", + "@polkadot/util-crypto": "^3.6.2-5", "bn.js": "^5.1.3", "eventemitter3": "^4.0.7", "rxjs": "^6.6.3" }, "devDependencies": { - "@polkadot/keyring": "^3.6.1" + "@polkadot/keyring": "^3.6.2-5" } } diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 4635676a11..f9f6d2d7dc 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -8,7 +8,7 @@ import { detectPackage } from '@polkadot/util'; detectPackage(require('./package.json'), typeof __dirname !== 'undefined' && __dirname); export { Keyring } from '@polkadot/keyring'; -export { WsProvider } from '@polkadot/rpc-provider'; +export { default as WsProvider } from '@polkadot/rpc-provider/ws'; export { default as ApiPromise } from './promise'; export { default as ApiRx } from './rx'; diff --git a/packages/metadata/package.json b/packages/metadata/package.json index 856a5e2449..082fb1009d 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -29,11 +29,11 @@ "@babel/runtime": "^7.12.1", "@polkadot/types": "^2.4.2-0", "@polkadot/types-known": "^2.4.2-0", - "@polkadot/util": "^3.6.1", - "@polkadot/util-crypto": "^3.6.1", + "@polkadot/util": "^3.6.2-5", + "@polkadot/util-crypto": "^3.6.2-5", "bn.js": "^5.1.3" }, "devDependencies": { - "@polkadot/keyring": "^3.6.1" + "@polkadot/keyring": "^3.6.2-5" } } diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 4b66d5fb50..ee7042608f 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -30,11 +30,11 @@ "@polkadot/metadata": "^2.4.2-0", "@polkadot/rpc-provider": "^2.4.2-0", "@polkadot/types": "^2.4.2-0", - "@polkadot/util": "^3.6.1", + "@polkadot/util": "^3.6.2-5", "memoizee": "^0.4.14", "rxjs": "^6.6.3" }, "devDependencies": { - "@polkadot/keyring": "^3.6.1" + "@polkadot/keyring": "^3.6.2-5" } } diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 983e753e98..465a7e2b61 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -29,15 +29,15 @@ "@babel/runtime": "^7.12.1", "@polkadot/metadata": "^2.4.2-0", "@polkadot/types": "^2.4.2-0", - "@polkadot/util": "^3.6.1", - "@polkadot/util-crypto": "^3.6.1", + "@polkadot/util": "^3.6.2-5", + "@polkadot/util-crypto": "^3.6.2-5", "@polkadot/x-fetch": "^0.3.5", "@polkadot/x-ws": "^0.3.5", "bn.js": "^5.1.3", "eventemitter3": "^4.0.7" }, "devDependencies": { - "@polkadot/keyring": "^3.6.1", + "@polkadot/keyring": "^3.6.2-5", "mock-socket": "^9.0.3", "nock": "^13.0.4" } diff --git a/packages/rpc-provider/src/ws/errors.ts b/packages/rpc-provider/src/ws/errors.ts index a31b700472..b9afd07eaa 100644 --- a/packages/rpc-provider/src/ws/errors.ts +++ b/packages/rpc-provider/src/ws/errors.ts @@ -3,7 +3,7 @@ // from https://stackoverflow.com/questions/19304157/getting-the-reason-why-websockets-closed-with-close-code-1006 -const specificStatusCodeMappings: Record = { +const known: Record = { 1000: 'Normal Closure', 1001: 'Going Away', 1002: 'Protocol Error', @@ -37,5 +37,5 @@ export function getWSErrorString (code: number): string { } } - return specificStatusCodeMappings[code] || '(Unknown)'; + return known[code] || '(Unknown)'; } diff --git a/packages/typegen/package.json b/packages/typegen/package.json index d924590ff6..011d518490 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -40,7 +40,7 @@ "@polkadot/metadata": "^2.4.2-0", "@polkadot/rpc-provider": "^2.4.2-0", "@polkadot/types": "^2.4.2-0", - "@polkadot/util": "^3.6.1", + "@polkadot/util": "^3.6.2-5", "handlebars": "^4.7.6", "websocket": "^1.0.32", "yargs": "^16.1.0" diff --git a/packages/types-known/package.json b/packages/types-known/package.json index 1cd3e73744..673fea3d82 100644 --- a/packages/types-known/package.json +++ b/packages/types-known/package.json @@ -28,7 +28,7 @@ "dependencies": { "@babel/runtime": "^7.12.1", "@polkadot/types": "^2.4.2-0", - "@polkadot/util": "^3.6.1", + "@polkadot/util": "^3.6.2-5", "bn.js": "^5.1.3" }, "devDependencies": { diff --git a/packages/types/package.json b/packages/types/package.json index bc05dc5470..fe638727a8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -28,15 +28,15 @@ "dependencies": { "@babel/runtime": "^7.12.1", "@polkadot/metadata": "^2.4.2-0", - "@polkadot/util": "^3.6.1", - "@polkadot/util-crypto": "^3.6.1", + "@polkadot/util": "^3.6.2-5", + "@polkadot/util-crypto": "^3.6.2-5", "@types/bn.js": "^4.11.6", "bn.js": "^5.1.3", "memoizee": "^0.4.14", "rxjs": "^6.6.3" }, "devDependencies": { - "@polkadot/keyring": "^3.6.1", + "@polkadot/keyring": "^3.6.2-5", "@types/memoizee": "^0.4.4" } } diff --git a/yarn.lock b/yarn.lock index 07d01315c3..5a61c533b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1720,7 +1720,7 @@ __metadata: "@polkadot/api": ^2.4.2-0 "@polkadot/rpc-core": ^2.4.2-0 "@polkadot/types": ^2.4.2-0 - "@polkadot/util": ^3.6.1 + "@polkadot/util": ^3.6.2-5 bn.js: ^5.1.3 rxjs: ^6.6.3 languageName: unknown @@ -1732,12 +1732,12 @@ __metadata: dependencies: "@babel/runtime": ^7.12.1 "@polkadot/api": ^2.4.2-0 - "@polkadot/keyring": ^3.6.1 + "@polkadot/keyring": ^3.6.2-5 "@polkadot/rpc-core": ^2.4.2-0 "@polkadot/rpc-provider": ^2.4.2-0 "@polkadot/types": ^2.4.2-0 - "@polkadot/util": ^3.6.1 - "@polkadot/util-crypto": ^3.6.1 + "@polkadot/util": ^3.6.2-5 + "@polkadot/util-crypto": ^3.6.2-5 bn.js: ^5.1.3 memoizee: ^0.4.14 rxjs: ^6.6.3 @@ -1750,14 +1750,14 @@ __metadata: dependencies: "@babel/runtime": ^7.12.1 "@polkadot/api-derive": ^2.4.2-0 - "@polkadot/keyring": ^3.6.1 + "@polkadot/keyring": ^3.6.2-5 "@polkadot/metadata": ^2.4.2-0 "@polkadot/rpc-core": ^2.4.2-0 "@polkadot/rpc-provider": ^2.4.2-0 "@polkadot/types": ^2.4.2-0 "@polkadot/types-known": ^2.4.2-0 - "@polkadot/util": ^3.6.1 - "@polkadot/util-crypto": ^3.6.1 + "@polkadot/util": ^3.6.2-5 + "@polkadot/util-crypto": ^3.6.2-5 bn.js: ^5.1.3 eventemitter3: ^4.0.7 rxjs: ^6.6.3 @@ -1859,14 +1859,14 @@ __metadata: languageName: node linkType: hard -"@polkadot/keyring@npm:^3.6.1": - version: 3.6.1 - resolution: "@polkadot/keyring@npm:3.6.1" +"@polkadot/keyring@npm:^3.6.2-5": + version: 3.6.2-5 + resolution: "@polkadot/keyring@npm:3.6.2-5" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/util": 3.6.1 - "@polkadot/util-crypto": 3.6.1 - checksum: 088dd674dee59ae523ea457bbf980b4f1eb9749702e082248c6ead93541dcbea4d2b780d16233db2363632ce70e2f3866ea445fdd14524e336e30cfb27aff07d + "@polkadot/util": ^3.6.2-5 + "@polkadot/util-crypto": ^3.6.2-5 + checksum: 54cd6c9f6f579b013dbd79ba4fb5b35da10d337beee12633756059e027a44b941d15c862bf37039faf409d1a1c53a8ec6b02213cf41b223d0a18d069e5697068 languageName: node linkType: hard @@ -1875,21 +1875,21 @@ __metadata: resolution: "@polkadot/metadata@workspace:packages/metadata" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/keyring": ^3.6.1 + "@polkadot/keyring": ^3.6.2-5 "@polkadot/types": ^2.4.2-0 "@polkadot/types-known": ^2.4.2-0 - "@polkadot/util": ^3.6.1 - "@polkadot/util-crypto": ^3.6.1 + "@polkadot/util": ^3.6.2-5 + "@polkadot/util-crypto": ^3.6.2-5 bn.js: ^5.1.3 languageName: unknown linkType: soft -"@polkadot/networks@npm:3.6.1": - version: 3.6.1 - resolution: "@polkadot/networks@npm:3.6.1" +"@polkadot/networks@npm:^3.6.2-5": + version: 3.6.2-5 + resolution: "@polkadot/networks@npm:3.6.2-5" dependencies: "@babel/runtime": ^7.12.1 - checksum: a9fdeed5f3fada04040c51a9ac6fb66d305a9af57b65c4a71c72726771143eba171a413215f9165703e8e608614bd9a42851f23ea463cf64febc8dfd427d0fd5 + checksum: d2e9244a181ba778bc90d1bb3d0d2cdb46a5e4ae0236ef724d708722bdacbabad29904a1b606e4357e85752db5514aeff7bc8d7f4fdb5f9809689c871b0095c1 languageName: node linkType: hard @@ -1898,11 +1898,11 @@ __metadata: resolution: "@polkadot/rpc-core@workspace:packages/rpc-core" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/keyring": ^3.6.1 + "@polkadot/keyring": ^3.6.2-5 "@polkadot/metadata": ^2.4.2-0 "@polkadot/rpc-provider": ^2.4.2-0 "@polkadot/types": ^2.4.2-0 - "@polkadot/util": ^3.6.1 + "@polkadot/util": ^3.6.2-5 memoizee: ^0.4.14 rxjs: ^6.6.3 languageName: unknown @@ -1913,11 +1913,11 @@ __metadata: resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/keyring": ^3.6.1 + "@polkadot/keyring": ^3.6.2-5 "@polkadot/metadata": ^2.4.2-0 "@polkadot/types": ^2.4.2-0 - "@polkadot/util": ^3.6.1 - "@polkadot/util-crypto": ^3.6.1 + "@polkadot/util": ^3.6.2-5 + "@polkadot/util-crypto": ^3.6.2-5 "@polkadot/x-fetch": ^0.3.5 "@polkadot/x-ws": ^0.3.5 bn.js: ^5.1.3 @@ -1947,7 +1947,7 @@ __metadata: "@polkadot/metadata": ^2.4.2-0 "@polkadot/rpc-provider": ^2.4.2-0 "@polkadot/types": ^2.4.2-0 - "@polkadot/util": ^3.6.1 + "@polkadot/util": ^3.6.2-5 "@types/websocket": ^1.0.1 "@types/yargs": ^15.0.9 handlebars: ^4.7.6 @@ -1968,7 +1968,7 @@ __metadata: dependencies: "@babel/runtime": ^7.12.1 "@polkadot/types": ^2.4.2-0 - "@polkadot/util": ^3.6.1 + "@polkadot/util": ^3.6.2-5 "@types/bn.js": ^4.11.6 bn.js: ^5.1.3 languageName: unknown @@ -1979,10 +1979,10 @@ __metadata: resolution: "@polkadot/types@workspace:packages/types" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/keyring": ^3.6.1 + "@polkadot/keyring": ^3.6.2-5 "@polkadot/metadata": ^2.4.2-0 - "@polkadot/util": ^3.6.1 - "@polkadot/util-crypto": ^3.6.1 + "@polkadot/util": ^3.6.2-5 + "@polkadot/util-crypto": ^3.6.2-5 "@types/bn.js": ^4.11.6 "@types/memoizee": ^0.4.4 bn.js: ^5.1.3 @@ -1991,13 +1991,13 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/util-crypto@npm:3.6.1, @polkadot/util-crypto@npm:^3.6.1": - version: 3.6.1 - resolution: "@polkadot/util-crypto@npm:3.6.1" +"@polkadot/util-crypto@npm:^3.6.2-5": + version: 3.6.2-5 + resolution: "@polkadot/util-crypto@npm:3.6.2-5" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/networks": 3.6.1 - "@polkadot/util": 3.6.1 + "@polkadot/networks": ^3.6.2-5 + "@polkadot/util": ^3.6.2-5 "@polkadot/wasm-crypto": ^1.4.1 base-x: ^3.0.8 bip39: ^3.0.2 @@ -2009,23 +2009,22 @@ __metadata: scryptsy: ^2.1.0 tweetnacl: ^1.0.3 xxhashjs: ^0.2.2 - checksum: 2b60b400ac9ebdfa5ac05e249b8d88c564a5739a7d8ec52f52c6743707eb05b0d9fd5a96bd9e52eb8f3045b71365cdc22318bef91c2529e0da8f669fa2e34593 + checksum: e019d92df7383e00c8eda8937d06cdeddefa28d1429f776af23a717bb6be6bb0ce9f9df2b0b7022cfc04e6cc4702e3a659ec43848c0bcce29b3bc61f9e30d973 languageName: node linkType: hard -"@polkadot/util@npm:3.6.1, @polkadot/util@npm:^3.6.1": - version: 3.6.1 - resolution: "@polkadot/util@npm:3.6.1" +"@polkadot/util@npm:^3.6.2-5": + version: 3.6.2-5 + resolution: "@polkadot/util@npm:3.6.2-5" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/x-textdecoder": ^0.3.3 - "@polkadot/x-textencoder": ^0.3.3 + "@polkadot/x-textdecoder": ^0.3.5 + "@polkadot/x-textencoder": ^0.3.5 "@types/bn.js": ^4.11.6 bn.js: ^5.1.3 camelcase: ^5.3.1 - chalk: ^4.1.0 ip-regex: ^4.2.0 - checksum: fe56d11fa68eff4c26bfad8b3e8c5340adb46c8e8b6c0ff9215d52efe20f5237c0c2da1c2788ede17880b1ad4d99e82bd62524453ccf9ee08569e8949853adad + checksum: 66f501ae1fc59b315660567cfb50a3cb9f569367efa5dca7e8e7a6528b3172f874a2b3e9327f61b410a5d95dfd5ecfb2882da7dc0810d6c54396008efb3fb4d0 languageName: node linkType: hard @@ -2049,7 +2048,7 @@ __metadata: languageName: node linkType: hard -"@polkadot/x-textdecoder@npm:^0.3.3": +"@polkadot/x-textdecoder@npm:^0.3.5": version: 0.3.5 resolution: "@polkadot/x-textdecoder@npm:0.3.5" dependencies: @@ -2058,7 +2057,7 @@ __metadata: languageName: node linkType: hard -"@polkadot/x-textencoder@npm:^0.3.3": +"@polkadot/x-textencoder@npm:^0.3.5": version: 0.3.5 resolution: "@polkadot/x-textencoder@npm:0.3.5" dependencies: