From c10e4d3fc1ae41c9d033fab4313c5a10cae20486 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 17 Sep 2020 10:05:34 +0200 Subject: [PATCH] Use polyfills from polkadot-js (#2616) * Use polyfills from polkadot-js * no empty catch * Non-working asjustments * Adjust WS mocking * Bump polyfills * Bumps * Restore common --- packages/api-contract/package.json | 6 +- packages/api-derive/package.json | 8 +- packages/api/package.json | 12 +- packages/metadata/package.json | 4 +- packages/rpc-core/package.json | 6 +- packages/rpc-provider/package.json | 10 +- packages/rpc-provider/src/http/index.ts | 2 +- packages/rpc-provider/src/http/send.spec.ts | 3 +- packages/rpc-provider/src/ws/Provider.ts | 12 +- packages/rpc-provider/src/ws/connect.spec.ts | 3 +- packages/rpc-provider/src/ws/getWS.spec.ts | 40 ------ packages/rpc-provider/src/ws/getWS.ts | 23 ---- packages/rpc-provider/src/ws/index.spec.ts | 3 +- packages/rpc-provider/src/ws/onOpen.spec.ts | 3 +- packages/rpc-provider/src/ws/send.spec.ts | 3 +- .../rpc-provider/src/ws/subscribe.spec.ts | 3 +- .../rpc-provider/src/ws/unsubscribe.spec.ts | 3 +- packages/rpc-provider/test/mockWs.ts | 4 +- packages/typegen/package.json | 8 +- packages/typegen/src/fromChain.ts | 48 +++---- packages/types-known/package.json | 2 +- packages/types/package.json | 2 +- yarn.lock | 126 +++++++++++------- 23 files changed, 160 insertions(+), 174 deletions(-) delete mode 100644 packages/rpc-provider/src/ws/getWS.spec.ts delete mode 100644 packages/rpc-provider/src/ws/getWS.ts diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index c250aff5dc..d6258a590f 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -27,9 +27,9 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/api": "1.34.0-beta.8", - "@polkadot/rpc-core": "1.34.0-beta.8", - "@polkadot/types": "1.34.0-beta.8", + "@polkadot/api": "^1.34.0-beta.8", + "@polkadot/rpc-core": "^1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "bn.js": "^5.1.3", "rxjs": "^6.6.3" diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 3d3a6b5de2..ad1fea265e 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -28,10 +28,10 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/api": "1.34.0-beta.8", - "@polkadot/rpc-core": "1.34.0-beta.8", - "@polkadot/rpc-provider": "1.34.0-beta.8", - "@polkadot/types": "1.34.0-beta.8", + "@polkadot/api": "^1.34.0-beta.8", + "@polkadot/rpc-core": "^1.34.0-beta.8", + "@polkadot/rpc-provider": "^1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "@polkadot/util-crypto": "^3.4.1", "bn.js": "^5.1.3", diff --git a/packages/api/package.json b/packages/api/package.json index b8901435e0..0abe4cfcd4 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -27,13 +27,13 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/api-derive": "1.34.0-beta.8", + "@polkadot/api-derive": "^1.34.0-beta.8", "@polkadot/keyring": "^3.4.1", - "@polkadot/metadata": "1.34.0-beta.8", - "@polkadot/rpc-core": "1.34.0-beta.8", - "@polkadot/rpc-provider": "1.34.0-beta.8", - "@polkadot/types": "1.34.0-beta.8", - "@polkadot/types-known": "1.34.0-beta.8", + "@polkadot/metadata": "^1.34.0-beta.8", + "@polkadot/rpc-core": "^1.34.0-beta.8", + "@polkadot/rpc-provider": "^1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", + "@polkadot/types-known": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "@polkadot/util-crypto": "^3.4.1", "bn.js": "^5.1.3", diff --git a/packages/metadata/package.json b/packages/metadata/package.json index fb6b5b59a7..fc0f2c0a30 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -27,8 +27,8 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/types": "1.34.0-beta.8", - "@polkadot/types-known": "1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", + "@polkadot/types-known": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "@polkadot/util-crypto": "^3.4.1", "bn.js": "^5.1.3" diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index ec47fa90d0..796ed40d60 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -27,9 +27,9 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/metadata": "1.34.0-beta.8", - "@polkadot/rpc-provider": "1.34.0-beta.8", - "@polkadot/types": "1.34.0-beta.8", + "@polkadot/metadata": "^1.34.0-beta.8", + "@polkadot/rpc-provider": "^1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "memoizee": "^0.4.14", "rxjs": "^6.6.3" diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 4547af4133..9862d8cb8d 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -27,14 +27,14 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/metadata": "1.34.0-beta.8", - "@polkadot/types": "1.34.0-beta.8", + "@polkadot/metadata": "^1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "@polkadot/util-crypto": "^3.4.1", + "@polkadot/x-fetch": "^0.3.2", + "@polkadot/x-ws": "^0.3.2", "bn.js": "^5.1.3", - "cross-fetch": "^3.0.6", - "eventemitter3": "^4.0.7", - "websocket": "^1.0.32" + "eventemitter3": "^4.0.7" }, "devDependencies": { "@polkadot/keyring": "^3.4.1", diff --git a/packages/rpc-provider/src/http/index.ts b/packages/rpc-provider/src/http/index.ts index c8be6b5010..3a23384ce8 100644 --- a/packages/rpc-provider/src/http/index.ts +++ b/packages/rpc-provider/src/http/index.ts @@ -4,8 +4,8 @@ import { ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitted, ProviderInterfaceEmitCb } from '../types'; -import fetch from 'cross-fetch'; import { assert, logger } from '@polkadot/util'; +import fetch from '@polkadot/x-fetch'; import Coder from '../coder'; import defaults from '../defaults'; diff --git a/packages/rpc-provider/src/http/send.spec.ts b/packages/rpc-provider/src/http/send.spec.ts index 1f7f03ba0c..8db40ef96b 100644 --- a/packages/rpc-provider/src/http/send.spec.ts +++ b/packages/rpc-provider/src/http/send.spec.ts @@ -2,10 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import Http from './'; import { Mock } from './../mock/types'; import { mockHttp, TEST_HTTP_URL } from '../../test/mockHttp'; +import Http from './'; + describe('send', (): void => { let http: Http; let mock: Mock; diff --git a/packages/rpc-provider/src/ws/Provider.ts b/packages/rpc-provider/src/ws/Provider.ts index da4e9f0815..4845f342dd 100644 --- a/packages/rpc-provider/src/ws/Provider.ts +++ b/packages/rpc-provider/src/ws/Provider.ts @@ -7,12 +7,12 @@ import { JsonRpcResponse, ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitted, ProviderInterfaceEmitCb } from '../types'; import EventEmitter from 'eventemitter3'; -import { assert, isNull, isUndefined, logger } from '@polkadot/util'; +import { assert, isChildClass, isNull, isUndefined, logger } from '@polkadot/util'; +import WS from '@polkadot/x-ws'; import Coder from '../coder'; import defaults from '../defaults'; import { getWSErrorString } from './errors'; -import { createWS } from './getWS'; interface SubscriptionHandler { callback: ProviderInterfaceCallback; @@ -143,10 +143,16 @@ export default class WsProvider implements ProviderInterface { * @description The [[WsProvider]] connects automatically by default, however if you decided otherwise, you may * connect manually using this method. */ + // eslint-disable-next-line @typescript-eslint/require-await public async connect (): Promise { try { this.#endpointIndex = (this.#endpointIndex + 1) % this.#endpoints.length; - this.#websocket = await createWS(this.#endpoints[this.#endpointIndex], this.#headers); + this.#websocket = typeof WebSocket !== 'undefined' && isChildClass(WebSocket, WS) + ? new WS(this.#endpoints[this.#endpointIndex]) + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore - WS may be an instance of w3cwebsocket, which supports headers + : new WS(this.#endpoints[this.#endpointIndex], undefined, undefined, this.#headers); + this.#websocket.onclose = this.#onSocketClose; this.#websocket.onerror = this.#onSocketError; this.#websocket.onmessage = this.#onSocketMessage; diff --git a/packages/rpc-provider/src/ws/connect.spec.ts b/packages/rpc-provider/src/ws/connect.spec.ts index 23d8ed3f7b..c9559b2b97 100644 --- a/packages/rpc-provider/src/ws/connect.spec.ts +++ b/packages/rpc-provider/src/ws/connect.spec.ts @@ -2,10 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import WsProvider from './'; import { Mock } from './../mock/types'; import { mockWs, TEST_WS_URL } from '../../test/mockWs'; +import WsProvider from './'; + function sleepMs (ms = 0): Promise { return new Promise((resolve) => setTimeout(resolve, ms)); } diff --git a/packages/rpc-provider/src/ws/getWS.spec.ts b/packages/rpc-provider/src/ws/getWS.spec.ts deleted file mode 100644 index 7f44556854..0000000000 --- a/packages/rpc-provider/src/ws/getWS.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2017-2020 @polkadot/rpc-provider authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -import { Constructor } from '@polkadot/types/types'; - -import { Global } from './../mock/types'; -import { getWSClass } from './getWS'; - -declare const global: Global; - -describe('getWSClass', (): void => { - let origWs: Constructor; - - beforeEach((): void => { - origWs = global.WebSocket; - }); - - afterEach((): void => { - global.WebSocket = origWs; - }); - - it('polyfills with no exceptions (with WebSocket)', async (): Promise => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - (global as any).WebSocket = undefined; - - const [WS] = await getWSClass(); - - expect(WS).toBeDefined(); - }); - - it('polyfills with no exceptions (without WebSocket)', async (): Promise => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - (global as any).WebSocket = (): boolean => true; - - const [WS] = await getWSClass(); - - expect(WS).toBeDefined(); - }); -}); diff --git a/packages/rpc-provider/src/ws/getWS.ts b/packages/rpc-provider/src/ws/getWS.ts deleted file mode 100644 index 7c2394a4fe..0000000000 --- a/packages/rpc-provider/src/ws/getWS.ts +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2017-2020 @polkadot/rpc-provider authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -export async function getWSClass (): Promise<[typeof WebSocket, boolean]> { - if (typeof WebSocket === 'undefined') { - const { w3cwebsocket } = await import('websocket'); - - return [w3cwebsocket as unknown as typeof WebSocket, false]; - } - - return [WebSocket, true]; -} - -export async function createWS (endpoint: string, headers?: Record): Promise { - const [WS, isDefault] = await getWSClass(); - - return isDefault - ? new WS(endpoint) - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - WS may be an instance of w3cwebsocket, which supports headers - : new WS(endpoint, undefined, undefined, headers); -} diff --git a/packages/rpc-provider/src/ws/index.spec.ts b/packages/rpc-provider/src/ws/index.spec.ts index e0bc099d74..50c34e1c2c 100644 --- a/packages/rpc-provider/src/ws/index.spec.ts +++ b/packages/rpc-provider/src/ws/index.spec.ts @@ -2,10 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import WsProvider from './'; import { Mock } from './../mock/types'; import { mockWs, TEST_WS_URL } from '../../test/mockWs'; +import WsProvider from './'; + let ws: WsProvider; let mock: Mock; diff --git a/packages/rpc-provider/src/ws/onOpen.spec.ts b/packages/rpc-provider/src/ws/onOpen.spec.ts index 4e19b3c986..25ca1150db 100644 --- a/packages/rpc-provider/src/ws/onOpen.spec.ts +++ b/packages/rpc-provider/src/ws/onOpen.spec.ts @@ -2,10 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import WsProvider from './'; import { Mock } from './../mock/types'; import { mockWs, TEST_WS_URL } from '../../test/mockWs'; +import WsProvider from './'; + let ws: WsProvider; let mock: Mock; diff --git a/packages/rpc-provider/src/ws/send.spec.ts b/packages/rpc-provider/src/ws/send.spec.ts index 8a53851503..729e7cddd1 100644 --- a/packages/rpc-provider/src/ws/send.spec.ts +++ b/packages/rpc-provider/src/ws/send.spec.ts @@ -4,10 +4,11 @@ import { Constructor } from '@polkadot/types/types'; -import WsProvider from './'; import { Global, Mock } from './../mock/types'; import { mockWs, TEST_WS_URL } from '../../test/mockWs'; +import WsProvider from './'; + declare const global: Global; let provider: WsProvider; diff --git a/packages/rpc-provider/src/ws/subscribe.spec.ts b/packages/rpc-provider/src/ws/subscribe.spec.ts index 673a3a974b..6f32d74baf 100644 --- a/packages/rpc-provider/src/ws/subscribe.spec.ts +++ b/packages/rpc-provider/src/ws/subscribe.spec.ts @@ -4,10 +4,11 @@ import { Constructor } from '@polkadot/types/types'; -import WsProvider from './'; import { Global, Mock } from './../mock/types'; import { mockWs, TEST_WS_URL } from '../../test/mockWs'; +import WsProvider from './'; + declare const global: Global; let ws: WsProvider; diff --git a/packages/rpc-provider/src/ws/unsubscribe.spec.ts b/packages/rpc-provider/src/ws/unsubscribe.spec.ts index c3d89d0185..efeb160001 100644 --- a/packages/rpc-provider/src/ws/unsubscribe.spec.ts +++ b/packages/rpc-provider/src/ws/unsubscribe.spec.ts @@ -4,10 +4,11 @@ import { Constructor } from '@polkadot/types/types'; -import WsProvider from './'; import { Global, Mock } from './../mock/types'; import { mockWs, TEST_WS_URL } from '../../test/mockWs'; +import WsProvider from './'; + declare const global: Global; let ws: WsProvider; diff --git a/packages/rpc-provider/test/mockWs.ts b/packages/rpc-provider/test/mockWs.ts index 8c1662c732..d72e708ae1 100644 --- a/packages/rpc-provider/test/mockWs.ts +++ b/packages/rpc-provider/test/mockWs.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Server } from 'mock-socket'; +import { Server, WebSocket } from 'mock-socket'; const TEST_WS_URL = 'ws://localhost:9955'; @@ -28,6 +28,8 @@ interface ReplyDef { }; } +global.WebSocket = WebSocket; + // should be JSONRPC def return function createError ({ error: { code, message }, id }: ErrorDef): any { return { diff --git a/packages/typegen/package.json b/packages/typegen/package.json index e6354a1f09..15c0249e43 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -36,10 +36,10 @@ "@babel/core": "^7.11.6", "@babel/register": "^7.11.5", "@babel/runtime": "^7.11.2", - "@polkadot/api": "1.34.0-beta.8", - "@polkadot/metadata": "1.34.0-beta.8", - "@polkadot/rpc-provider": "1.34.0-beta.8", - "@polkadot/types": "1.34.0-beta.8", + "@polkadot/api": "^1.34.0-beta.8", + "@polkadot/metadata": "^1.34.0-beta.8", + "@polkadot/rpc-provider": "^1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "handlebars": "^4.7.6", "websocket": "^1.0.32", diff --git a/packages/typegen/src/fromChain.ts b/packages/typegen/src/fromChain.ts index 1c73f482cb..6806a45c20 100644 --- a/packages/typegen/src/fromChain.ts +++ b/packages/typegen/src/fromChain.ts @@ -4,8 +4,8 @@ import path from 'path'; import yargs from 'yargs'; -import { createWS } from '@polkadot/rpc-provider/ws/getWS'; import { formatNumber } from '@polkadot/util'; +import WS from '@polkadot/x-ws'; import generateConst from './generate/consts'; import generateQuery from './generate/query'; @@ -60,31 +60,31 @@ export default function main (): void { }).argv; if (endpoint.startsWith('wss://') || endpoint.startsWith('ws://')) { - createWS(endpoint) - .then((websocket): void => { - websocket.onclose = (event: { code: number; reason: string }): void => { - console.error(`disconnected, code: '${event.code}' reason: '${event.reason}'`); - process.exit(1); - }; + try { + const websocket = new WS(endpoint); - websocket.onerror = (event: any): void => { - console.error(event); - process.exit(1); - }; - - websocket.onopen = (): void => { - console.log('connected'); - websocket.send('{"id":"1","jsonrpc":"2.0","method":"state_getMetadata","params":[]}'); - }; - - websocket.onmessage = (message: any): void => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - generate(JSON.parse(message.data).result, pkg, output, isStrict); - }; - }) - .catch((): void => { + websocket.onclose = (event: { code: number; reason: string }): void => { + console.error(`disconnected, code: '${event.code}' reason: '${event.reason}'`); process.exit(1); - }); + }; + + websocket.onerror = (event: any): void => { + console.error(event); + process.exit(1); + }; + + websocket.onopen = (): void => { + console.log('connected'); + websocket.send('{"id":"1","jsonrpc":"2.0","method":"state_getMetadata","params":[]}'); + }; + + websocket.onmessage = (message: any): void => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + generate(JSON.parse(message.data).result, pkg, output, isStrict); + }; + } catch (error) { + process.exit(1); + } } else { // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-member-access generate(require(path.join(process.cwd(), endpoint)).result, pkg, output, isStrict); diff --git a/packages/types-known/package.json b/packages/types-known/package.json index 62e9dde997..e771a2242b 100644 --- a/packages/types-known/package.json +++ b/packages/types-known/package.json @@ -27,7 +27,7 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/types": "1.34.0-beta.8", + "@polkadot/types": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "bn.js": "^5.1.3" }, diff --git a/packages/types/package.json b/packages/types/package.json index 997c135b0d..a0fb48f32a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -27,7 +27,7 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/metadata": "1.34.0-beta.8", + "@polkadot/metadata": "^1.34.0-beta.8", "@polkadot/util": "^3.4.1", "@polkadot/util-crypto": "^3.4.1", "@types/bn.js": "^4.11.6", diff --git a/yarn.lock b/yarn.lock index dadf4ca2cb..89d4ae3037 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2756,25 +2756,25 @@ __metadata: resolution: "@polkadot/api-contract@workspace:packages/api-contract" dependencies: "@babel/runtime": ^7.11.2 - "@polkadot/api": 1.34.0-beta.8 - "@polkadot/rpc-core": 1.34.0-beta.8 - "@polkadot/types": 1.34.0-beta.8 + "@polkadot/api": ^1.34.0-beta.8 + "@polkadot/rpc-core": ^1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 bn.js: ^5.1.3 rxjs: ^6.6.3 languageName: unknown linkType: soft -"@polkadot/api-derive@1.34.0-beta.8, @polkadot/api-derive@workspace:packages/api-derive": +"@polkadot/api-derive@^1.34.0-beta.8, @polkadot/api-derive@workspace:packages/api-derive": version: 0.0.0-use.local resolution: "@polkadot/api-derive@workspace:packages/api-derive" dependencies: "@babel/runtime": ^7.11.2 - "@polkadot/api": 1.34.0-beta.8 + "@polkadot/api": ^1.34.0-beta.8 "@polkadot/keyring": ^3.4.1 - "@polkadot/rpc-core": 1.34.0-beta.8 - "@polkadot/rpc-provider": 1.34.0-beta.8 - "@polkadot/types": 1.34.0-beta.8 + "@polkadot/rpc-core": ^1.34.0-beta.8 + "@polkadot/rpc-provider": ^1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@polkadot/util-crypto": ^3.4.1 bn.js: ^5.1.3 @@ -2783,18 +2783,18 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/api@1.34.0-beta.8, @polkadot/api@workspace:packages/api": +"@polkadot/api@^1.34.0-beta.8, @polkadot/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@polkadot/api@workspace:packages/api" dependencies: "@babel/runtime": ^7.11.2 - "@polkadot/api-derive": 1.34.0-beta.8 + "@polkadot/api-derive": ^1.34.0-beta.8 "@polkadot/keyring": ^3.4.1 - "@polkadot/metadata": 1.34.0-beta.8 - "@polkadot/rpc-core": 1.34.0-beta.8 - "@polkadot/rpc-provider": 1.34.0-beta.8 - "@polkadot/types": 1.34.0-beta.8 - "@polkadot/types-known": 1.34.0-beta.8 + "@polkadot/metadata": ^1.34.0-beta.8 + "@polkadot/rpc-core": ^1.34.0-beta.8 + "@polkadot/rpc-provider": ^1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 + "@polkadot/types-known": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@polkadot/util-crypto": ^3.4.1 bn.js: ^5.1.3 @@ -2910,51 +2910,51 @@ __metadata: languageName: node linkType: hard -"@polkadot/metadata@1.34.0-beta.8, @polkadot/metadata@workspace:packages/metadata": +"@polkadot/metadata@^1.34.0-beta.8, @polkadot/metadata@workspace:packages/metadata": version: 0.0.0-use.local resolution: "@polkadot/metadata@workspace:packages/metadata" dependencies: "@babel/runtime": ^7.11.2 "@polkadot/keyring": ^3.4.1 - "@polkadot/types": 1.34.0-beta.8 - "@polkadot/types-known": 1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 + "@polkadot/types-known": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@polkadot/util-crypto": ^3.4.1 bn.js: ^5.1.3 languageName: unknown linkType: soft -"@polkadot/rpc-core@1.34.0-beta.8, @polkadot/rpc-core@workspace:packages/rpc-core": +"@polkadot/rpc-core@^1.34.0-beta.8, @polkadot/rpc-core@workspace:packages/rpc-core": version: 0.0.0-use.local resolution: "@polkadot/rpc-core@workspace:packages/rpc-core" dependencies: "@babel/runtime": ^7.11.2 "@polkadot/keyring": ^3.4.1 - "@polkadot/metadata": 1.34.0-beta.8 - "@polkadot/rpc-provider": 1.34.0-beta.8 - "@polkadot/types": 1.34.0-beta.8 + "@polkadot/metadata": ^1.34.0-beta.8 + "@polkadot/rpc-provider": ^1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 memoizee: ^0.4.14 rxjs: ^6.6.3 languageName: unknown linkType: soft -"@polkadot/rpc-provider@1.34.0-beta.8, @polkadot/rpc-provider@workspace:packages/rpc-provider": +"@polkadot/rpc-provider@^1.34.0-beta.8, @polkadot/rpc-provider@workspace:packages/rpc-provider": version: 0.0.0-use.local resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider" dependencies: "@babel/runtime": ^7.11.2 "@polkadot/keyring": ^3.4.1 - "@polkadot/metadata": 1.34.0-beta.8 - "@polkadot/types": 1.34.0-beta.8 + "@polkadot/metadata": ^1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@polkadot/util-crypto": ^3.4.1 + "@polkadot/x-fetch": ^0.3.2 + "@polkadot/x-ws": ^0.3.2 bn.js: ^5.1.3 - cross-fetch: ^3.0.6 eventemitter3: ^4.0.7 mock-socket: ^9.0.3 nock: ^13.0.4 - websocket: ^1.0.32 languageName: unknown linkType: soft @@ -2974,10 +2974,10 @@ __metadata: "@babel/core": ^7.11.6 "@babel/register": ^7.11.5 "@babel/runtime": ^7.11.2 - "@polkadot/api": 1.34.0-beta.8 - "@polkadot/metadata": 1.34.0-beta.8 - "@polkadot/rpc-provider": 1.34.0-beta.8 - "@polkadot/types": 1.34.0-beta.8 + "@polkadot/api": ^1.34.0-beta.8 + "@polkadot/metadata": ^1.34.0-beta.8 + "@polkadot/rpc-provider": ^1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@types/websocket": ^1.0.1 "@types/yargs": ^15.0.5 @@ -2993,25 +2993,25 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/types-known@1.34.0-beta.8, @polkadot/types-known@workspace:packages/types-known": +"@polkadot/types-known@^1.34.0-beta.8, @polkadot/types-known@workspace:packages/types-known": version: 0.0.0-use.local resolution: "@polkadot/types-known@workspace:packages/types-known" dependencies: "@babel/runtime": ^7.11.2 - "@polkadot/types": 1.34.0-beta.8 + "@polkadot/types": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@types/bn.js": ^4.11.6 bn.js: ^5.1.3 languageName: unknown linkType: soft -"@polkadot/types@1.34.0-beta.8, @polkadot/types@workspace:packages/types": +"@polkadot/types@^1.34.0-beta.8, @polkadot/types@workspace:packages/types": version: 0.0.0-use.local resolution: "@polkadot/types@workspace:packages/types" dependencies: "@babel/runtime": ^7.11.2 "@polkadot/keyring": ^3.4.1 - "@polkadot/metadata": 1.34.0-beta.8 + "@polkadot/metadata": ^1.34.0-beta.8 "@polkadot/util": ^3.4.1 "@polkadot/util-crypto": ^3.4.1 "@types/bn.js": ^4.11.6 @@ -3066,6 +3066,28 @@ __metadata: languageName: node linkType: hard +"@polkadot/x-fetch@npm:^0.3.2": + version: 0.3.2 + resolution: "@polkadot/x-fetch@npm:0.3.2" + dependencies: + "@babel/runtime": ^7.11.2 + "@types/node-fetch": ^2.5.7 + node-fetch: ^2.6.1 + checksum: 51d768e41e01cad09758ab641178cc192c81af85c2d5bd9bc6c033fbf0d6e09af4889e7371ed14e64b6189f55ee5084baa8612287de699a5f3ede8bad7ee9be0 + languageName: node + linkType: hard + +"@polkadot/x-ws@npm:^0.3.2": + version: 0.3.2 + resolution: "@polkadot/x-ws@npm:0.3.2" + dependencies: + "@babel/runtime": ^7.11.2 + "@types/websocket": ^1.0.1 + websocket: ^1.0.32 + checksum: 7f1a0a036e76ea316dd58860ac80487fc9251240da3f36ae5995011e381c617d3f6e813edb621fb4a1655ffb81f49ab7ce800a445c31fc425f3475a30eb640c1 + languageName: node + linkType: hard + "@rushstack/eslint-patch@npm:^1.0.3": version: 1.0.3 resolution: "@rushstack/eslint-patch@npm:1.0.3" @@ -3305,6 +3327,16 @@ __metadata: languageName: node linkType: hard +"@types/node-fetch@npm:^2.5.7": + version: 2.5.7 + resolution: "@types/node-fetch@npm:2.5.7" + dependencies: + "@types/node": "*" + form-data: ^3.0.0 + checksum: 101f6e8474407f957dfe1750d82aa0bcaa56347d09c8ba8634e6a901d07032533c0a578860691d915ff8fa230355700c41c04ae7e505840b5d6ff8cc3ece7741 + languageName: node + linkType: hard + "@types/node@npm:*, @types/node@npm:>= 8": version: 14.10.2 resolution: "@types/node@npm:14.10.2" @@ -5884,7 +5916,7 @@ __metadata: languageName: node linkType: hard -"combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.6": +"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6": version: 1.0.8 resolution: "combined-stream@npm:1.0.8" dependencies: @@ -6372,15 +6404,6 @@ __metadata: languageName: node linkType: hard -"cross-fetch@npm:^3.0.6": - version: 3.0.6 - resolution: "cross-fetch@npm:3.0.6" - dependencies: - node-fetch: 2.6.1 - checksum: a491ad1b89988a351f8b8b252b68a5e653636d911042648c43a806cf7575ff043379a80d6269102ca60ec633af0b49ca4c83536007793bb0e65e491769f70d9d - languageName: node - linkType: hard - "cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" @@ -8753,6 +8776,17 @@ __metadata: languageName: node linkType: hard +"form-data@npm:^3.0.0": + version: 3.0.0 + resolution: "form-data@npm:3.0.0" + dependencies: + asynckit: ^0.4.0 + combined-stream: ^1.0.8 + mime-types: ^2.1.12 + checksum: 1af88217b449eda6566a0d95185f2baa403ed2a0e3b11547069f6062be66cbac7c8d7a25f0fc59560702e96526e659b5b9e5a8c6fefe00f06da44338191a9133 + languageName: node + linkType: hard + "form-data@npm:~2.3.2": version: 2.3.3 resolution: "form-data@npm:2.3.3" @@ -13008,7 +13042,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-fetch@npm:2.6.1, node-fetch@npm:^2.5.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1": +"node-fetch@npm:^2.5.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1": version: 2.6.1 resolution: "node-fetch@npm:2.6.1" checksum: cbb171635e538162b977eac5dfe7a1e07a9a02e991924377a6435502291e2f823d306b95aabc455caebf4a118ccf836868462bc70ccc3095af02bb9da61fda37