From e2911a33c467bf032ff12d1fac4483d2fa3bf8a2 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 13 Dec 2020 14:15:13 +0100 Subject: [PATCH] Replace memoizee with memoize from @polkadot/util (#2946) --- packages/api-contract/package.json | 2 +- packages/api-derive/package.json | 9 +- packages/api-derive/src/util/memo.ts | 17 +- packages/api/package.json | 6 +- packages/metadata/package.json | 6 +- packages/rpc-core/package.json | 7 +- packages/rpc-core/src/index.ts | 26 +- packages/rpc-core/src/util/index.ts | 1 - packages/rpc-core/src/util/normalizer.spec.ts | 30 --- packages/rpc-core/src/util/normalizer.ts | 13 - packages/rpc-provider/package.json | 10 +- packages/typegen/package.json | 2 +- packages/types-known/package.json | 2 +- packages/types/package.json | 10 +- yarn.lock | 222 ++++++------------ 15 files changed, 112 insertions(+), 251 deletions(-) delete mode 100644 packages/rpc-core/src/util/normalizer.spec.ts delete mode 100644 packages/rpc-core/src/util/normalizer.ts diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index c1031345c6..f75184ee77 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -15,7 +15,7 @@ "@babel/runtime": "^7.12.5", "@polkadot/api": "2.10.2-16", "@polkadot/types": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", "@polkadot/x-rxjs": "2.10.2-16", "bn.js": "^4.11.9" } diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 84412fa96f..00a51c566c 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -16,14 +16,13 @@ "@polkadot/api": "2.10.2-16", "@polkadot/rpc-core": "2.10.2-16", "@polkadot/types": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", - "@polkadot/util-crypto": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", + "@polkadot/util-crypto": "^4.2.2-21", "@polkadot/x-rxjs": "2.10.2-16", - "bn.js": "^4.11.9", - "memoizee": "^0.4.14" + "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^4.2.2-19", + "@polkadot/keyring": "^4.2.2-21", "@polkadot/rpc-provider": "2.10.2-16" } } diff --git a/packages/api-derive/src/util/memo.ts b/packages/api-derive/src/util/memo.ts index 393ee648ea..9c9caf7594 100644 --- a/packages/api-derive/src/util/memo.ts +++ b/packages/api-derive/src/util/memo.ts @@ -1,11 +1,11 @@ // Copyright 2017-2020 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 +import type { Memoized } from '@polkadot/util/types'; import type { Observer, TeardownLogic } from '@polkadot/x-rxjs'; -import createMemo from 'memoizee'; - -import { drr, normalizer } from '@polkadot/rpc-core/util'; +import { drr } from '@polkadot/rpc-core/util'; +import { memoize } from '@polkadot/util'; import { Observable } from '@polkadot/x-rxjs'; type ObsFn = (...params: any[]) => Observable; @@ -14,21 +14,18 @@ type ObsFn = (...params: any[]) => Observable; // 1. creates a memo of the inner fn -> Observable, removing when unsubscribed // 2. wraps the observable in a drr() (which includes an unsub delay) /** @internal */ -export function memo (instanceId: string, inner: ObsFn): ObsFn { - const cached = createMemo( +export function memo (instanceId: string, inner: ObsFn): Memoized> { + const cached = memoize( (...params: any[]): Observable => new Observable((observer: Observer): TeardownLogic => { const subscription = inner(...params).subscribe(observer); return (): void => { - cached.delete(...params); + cached.unmemoize(...params); subscription.unsubscribe(); }; }).pipe(drr()), - { - // Normalize via JSON.stringify, allow e.g. AccountId -> ss58 - normalizer: normalizer(instanceId) - } + { getInstanceId: () => instanceId } ); return cached; diff --git a/packages/api/package.json b/packages/api/package.json index e3dd8a5ff7..e063370f72 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -14,14 +14,14 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/api-derive": "2.10.2-16", - "@polkadot/keyring": "^4.2.2-19", + "@polkadot/keyring": "^4.2.2-21", "@polkadot/metadata": "2.10.2-16", "@polkadot/rpc-core": "2.10.2-16", "@polkadot/rpc-provider": "2.10.2-16", "@polkadot/types": "2.10.2-16", "@polkadot/types-known": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", - "@polkadot/util-crypto": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", + "@polkadot/util-crypto": "^4.2.2-21", "@polkadot/x-rxjs": "2.10.2-16", "bn.js": "^4.11.9", "eventemitter3": "^4.0.7" diff --git a/packages/metadata/package.json b/packages/metadata/package.json index 6bc47375de..ae767ac287 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -15,11 +15,11 @@ "@babel/runtime": "^7.12.5", "@polkadot/types": "2.10.2-16", "@polkadot/types-known": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", - "@polkadot/util-crypto": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", + "@polkadot/util-crypto": "^4.2.2-21", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^4.2.2-19" + "@polkadot/keyring": "^4.2.2-21" } } diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 2505c09031..2f361aaa17 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -16,11 +16,10 @@ "@polkadot/metadata": "2.10.2-16", "@polkadot/rpc-provider": "2.10.2-16", "@polkadot/types": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", - "@polkadot/x-rxjs": "2.10.2-16", - "memoizee": "^0.4.14" + "@polkadot/util": "^4.2.2-21", + "@polkadot/x-rxjs": "2.10.2-16" }, "devDependencies": { - "@polkadot/keyring": "^4.2.2-19" + "@polkadot/keyring": "^4.2.2-21" } } diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts index c44df99e57..dec38c525f 100644 --- a/packages/rpc-core/src/index.ts +++ b/packages/rpc-core/src/index.ts @@ -5,19 +5,18 @@ import type { ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc import type { StorageKey, Vec } from '@polkadot/types'; import type { Hash } from '@polkadot/types/interfaces'; import type { AnyJson, Codec, DefinitionRpc, DefinitionRpcExt, DefinitionRpcSub, Registry } from '@polkadot/types/types'; +import type { Memoized } from '@polkadot/util/types'; import type { Observer } from '@polkadot/x-rxjs'; import type { RpcInterface, RpcInterfaceMethod } from './types'; -import memoizee from 'memoizee'; - import { Option } from '@polkadot/types'; import { createClass, createTypeUnsafe } from '@polkadot/types/create'; import jsonrpc from '@polkadot/types/interfaces/jsonrpc'; -import { assert, hexToU8a, isFunction, isNull, isUndefined, logger, u8aToU8a } from '@polkadot/util'; +import { assert, hexToU8a, isFunction, isNull, isUndefined, logger, memoize, u8aToU8a } from '@polkadot/util'; import { Observable } from '@polkadot/x-rxjs'; import { publishReplay, refCount } from '@polkadot/x-rxjs/operators'; -import { drr, normalizer, refCountDelay } from './util'; +import { drr, refCountDelay } from './util'; interface StorageChangeSetJSON { block: string; @@ -210,14 +209,9 @@ export class RpcCore implements RpcInterface { }, {} as RpcInterface[Section]); } - private _memomize (creator: (outputAs: OutputType) => (...values: any[]) => Observable): RpcInterfaceMethod & memoizee.Memoized { - const memoized = memoizee(creator('scale') as RpcInterfaceMethod, { - // Dynamic length for argument - length: false, - // Normalize args so that different args that should be cached - // together are cached together. - // E.g.: `query.my.method('abc') === query.my.method(createType('AccountId', 'abc'));` - normalizer: normalizer(this.#instanceId) + private _memomize (creator: (outputAs: OutputType) => (...values: any[]) => Observable): Memoized { + const memoized = memoize(creator('scale') as RpcInterfaceMethod, { + getInstanceId: () => this.#instanceId }); memoized.json = creator('json'); @@ -230,7 +224,7 @@ export class RpcCore implements RpcInterface { const rpcName = def.endpoint || `${section}_${method}`; const hashIndex = def.params.findIndex(({ isHistoric }) => isHistoric); const cacheIndex = def.params.findIndex(({ isCached }) => isCached); - let memoized: null | RpcInterfaceMethod & memoizee.Memoized = null; + let memoized: null | Memoized = null; // execute the RPC call, doing a registry swap for historic as applicable const callWithRegistry = async (outputAs: OutputType, values: any[]): Promise => { @@ -266,7 +260,7 @@ export class RpcCore implements RpcInterface { return (): void => { // delete old results from cache - memoized?.delete(...values); + memoized?.unmemoize(...values); }; }).pipe( publishReplay(1), // create a Replay(1) @@ -299,7 +293,7 @@ export class RpcCore implements RpcInterface { const subName = `${section}_${subMethod}`; const unsubName = `${section}_${unsubMethod}`; const subType = `${section}_${updateType}`; - let memoized: null | RpcInterfaceMethod & memoizee.Memoized = null; + let memoized: null | Memoized = null; const creator = (outputAs: OutputType) => (...values: unknown[]): Observable => { return new Observable((observer: Observer): VoidCallback => { @@ -343,7 +337,7 @@ export class RpcCore implements RpcInterface { // Teardown logic return (): void => { // Delete from cache, so old results don't hang around - memoized?.delete(...values); + memoized?.unmemoize(...values); // Unsubscribe from provider subscriptionPromise diff --git a/packages/rpc-core/src/util/index.ts b/packages/rpc-core/src/util/index.ts index a426fb16c3..024f19ed20 100644 --- a/packages/rpc-core/src/util/index.ts +++ b/packages/rpc-core/src/util/index.ts @@ -2,5 +2,4 @@ // SPDX-License-Identifier: Apache-2.0 export * from './drr'; -export * from './normalizer'; export * from './refCountDelay'; diff --git a/packages/rpc-core/src/util/normalizer.spec.ts b/packages/rpc-core/src/util/normalizer.spec.ts deleted file mode 100644 index 01e590f0d2..0000000000 --- a/packages/rpc-core/src/util/normalizer.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017-2020 @polkadot/rpc-core authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { normalizer } from '.'; - -describe('normalizer', (): void => { - it('works when BigInt is in the data (object)', (): void => { - expect( - normalizer('instance')({ a: 'bar', b: 1234567890987654321n, c: 123 }) - ).toEqual('instance{"a":"bar","b":"1234567890987654321","c":123}'); - }); - - it('works when BigInt is in the data (array)', (): void => { - expect( - normalizer('instance')(['bar', 1234567890987654321n, 123]) - ).toEqual('instance["bar","1234567890987654321",123]'); - }); - - it('works when BigInt is in the data (single)', (): void => { - expect( - normalizer('instance')(1234567890987654321n) - ).toEqual('instance"1234567890987654321"'); - }); - - it('works when BigInt is in the data (nested)', (): void => { - expect( - normalizer('instance')({ a: 'bar', b: { foo: 1234567890987654321n }, c: 123 }) - ).toEqual('instance{"a":"bar","b":{"foo":"1234567890987654321"},"c":123}'); - }); -}); diff --git a/packages/rpc-core/src/util/normalizer.ts b/packages/rpc-core/src/util/normalizer.ts deleted file mode 100644 index e424948cc3..0000000000 --- a/packages/rpc-core/src/util/normalizer.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2017-2020 @polkadot/rpc-core authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { isBigInt } from '@polkadot/util'; - -export function normalizer (instanceId: string): (value: unknown) => string { - return (value: unknown) => - instanceId + JSON.stringify(value, (_, value: unknown) => - isBigInt(value) - ? value.toString() - : value - ); -} diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 24343790da..4216d5d8f2 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -14,15 +14,15 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/types": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", - "@polkadot/util-crypto": "^4.2.2-19", - "@polkadot/x-fetch": "^4.2.2-19", - "@polkadot/x-ws": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", + "@polkadot/util-crypto": "^4.2.2-21", + "@polkadot/x-fetch": "^4.2.2-21", + "@polkadot/x-ws": "^4.2.2-21", "bn.js": "^4.11.9", "eventemitter3": "^4.0.7" }, "devDependencies": { - "@polkadot/keyring": "^4.2.2-19", + "@polkadot/keyring": "^4.2.2-21", "@polkadot/metadata": "2.10.2-16", "mock-socket": "^9.0.3", "nock": "^13.0.5" diff --git a/packages/typegen/package.json b/packages/typegen/package.json index 98f0badb31..4624a4a53b 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -26,7 +26,7 @@ "@polkadot/metadata": "2.10.2-16", "@polkadot/rpc-provider": "2.10.2-16", "@polkadot/types": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", "handlebars": "^4.7.6", "websocket": "^1.0.33", "yargs": "^16.2.0" diff --git a/packages/types-known/package.json b/packages/types-known/package.json index 52f2e6eac9..919f9e6474 100644 --- a/packages/types-known/package.json +++ b/packages/types-known/package.json @@ -14,7 +14,7 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/types": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", "bn.js": "^4.11.9" }, "devDependencies": { diff --git a/packages/types/package.json b/packages/types/package.json index 65bde8da5d..7d4cc696f5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -14,15 +14,13 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/metadata": "2.10.2-16", - "@polkadot/util": "^4.2.2-19", - "@polkadot/util-crypto": "^4.2.2-19", + "@polkadot/util": "^4.2.2-21", + "@polkadot/util-crypto": "^4.2.2-21", "@polkadot/x-rxjs": "2.10.2-16", "@types/bn.js": "^4.11.6", - "bn.js": "^4.11.9", - "memoizee": "^0.4.14" + "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^4.2.2-19", - "@types/memoizee": "^0.4.5" + "@polkadot/keyring": "^4.2.2-21" } } diff --git a/yarn.lock b/yarn.lock index c1ed1a8f42..d0a32984d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1693,7 +1693,7 @@ __metadata: "@babel/runtime": ^7.12.5 "@polkadot/api": 2.10.2-16 "@polkadot/types": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 "@polkadot/x-rxjs": 2.10.2-16 bn.js: ^4.11.9 languageName: unknown @@ -1705,15 +1705,14 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/api": 2.10.2-16 - "@polkadot/keyring": ^4.2.2-19 + "@polkadot/keyring": ^4.2.2-21 "@polkadot/rpc-core": 2.10.2-16 "@polkadot/rpc-provider": 2.10.2-16 "@polkadot/types": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 - "@polkadot/util-crypto": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 + "@polkadot/util-crypto": ^4.2.2-21 "@polkadot/x-rxjs": 2.10.2-16 bn.js: ^4.11.9 - memoizee: ^0.4.14 languageName: unknown linkType: soft @@ -1723,14 +1722,14 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/api-derive": 2.10.2-16 - "@polkadot/keyring": ^4.2.2-19 + "@polkadot/keyring": ^4.2.2-21 "@polkadot/metadata": 2.10.2-16 "@polkadot/rpc-core": 2.10.2-16 "@polkadot/rpc-provider": 2.10.2-16 "@polkadot/types": 2.10.2-16 "@polkadot/types-known": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 - "@polkadot/util-crypto": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 + "@polkadot/util-crypto": ^4.2.2-21 "@polkadot/x-rxjs": 2.10.2-16 bn.js: ^4.11.9 eventemitter3: ^4.0.7 @@ -1830,17 +1829,17 @@ __metadata: languageName: node linkType: hard -"@polkadot/keyring@npm:^4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/keyring@npm:4.2.2-19" +"@polkadot/keyring@npm:^4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/keyring@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/util": 4.2.2-19 - "@polkadot/util-crypto": 4.2.2-19 + "@polkadot/util": 4.2.2-21 + "@polkadot/util-crypto": 4.2.2-21 peerDependencies: - "@polkadot/util": 4.2.2-19 - "@polkadot/util-crypto": 4.2.2-19 - checksum: 4eb08c31760d67ab5a6bda6586514a02497c777d6470fcdb147da866d04791ee4303fb66dc0cb7ced88e907eb184894a3344affc2768962c763cf76ea4cd58fb + "@polkadot/util": 4.2.2-21 + "@polkadot/util-crypto": 4.2.2-21 + checksum: b30aa2e930b37711b5f9affd64bdc0b699caf2b286131a6e224960a300e63d759c01a5c1ec8609c9d98d659bd2f8b4cf429dedf2878a80558006231b6f469320 languageName: node linkType: hard @@ -1849,21 +1848,21 @@ __metadata: resolution: "@polkadot/metadata@workspace:packages/metadata" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^4.2.2-19 + "@polkadot/keyring": ^4.2.2-21 "@polkadot/types": 2.10.2-16 "@polkadot/types-known": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 - "@polkadot/util-crypto": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 + "@polkadot/util-crypto": ^4.2.2-21 bn.js: ^4.11.9 languageName: unknown linkType: soft -"@polkadot/networks@npm:4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/networks@npm:4.2.2-19" +"@polkadot/networks@npm:4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/networks@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - checksum: b38578260c9fdc19c8f0fe1471b0b692afa1a20b0985856187515f59830760bf3ea3332033da0696a1aab6bfa037d8937eb205f9492d5eec6d9a7f4fa10893c8 + checksum: 74860f3f18083469740ad93c98677c1b655355c2eaa000bf775c5179fa8107e9e4b76ab2518c98a027c3b5ffd024822565ee7ef9b05543cb4e2b0a576d335e88 languageName: node linkType: hard @@ -1872,13 +1871,12 @@ __metadata: resolution: "@polkadot/rpc-core@workspace:packages/rpc-core" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^4.2.2-19 + "@polkadot/keyring": ^4.2.2-21 "@polkadot/metadata": 2.10.2-16 "@polkadot/rpc-provider": 2.10.2-16 "@polkadot/types": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 "@polkadot/x-rxjs": 2.10.2-16 - memoizee: ^0.4.14 languageName: unknown linkType: soft @@ -1887,13 +1885,13 @@ __metadata: resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^4.2.2-19 + "@polkadot/keyring": ^4.2.2-21 "@polkadot/metadata": 2.10.2-16 "@polkadot/types": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 - "@polkadot/util-crypto": ^4.2.2-19 - "@polkadot/x-fetch": ^4.2.2-19 - "@polkadot/x-ws": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 + "@polkadot/util-crypto": ^4.2.2-21 + "@polkadot/x-fetch": ^4.2.2-21 + "@polkadot/x-ws": ^4.2.2-21 bn.js: ^4.11.9 eventemitter3: ^4.0.7 mock-socket: ^9.0.3 @@ -1921,7 +1919,7 @@ __metadata: "@polkadot/metadata": 2.10.2-16 "@polkadot/rpc-provider": 2.10.2-16 "@polkadot/types": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 "@types/websocket": ^1.0.1 "@types/yargs": ^15.0.11 handlebars: ^4.7.6 @@ -1942,7 +1940,7 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/types": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 languageName: unknown @@ -1953,27 +1951,25 @@ __metadata: resolution: "@polkadot/types@workspace:packages/types" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^4.2.2-19 + "@polkadot/keyring": ^4.2.2-21 "@polkadot/metadata": 2.10.2-16 - "@polkadot/util": ^4.2.2-19 - "@polkadot/util-crypto": ^4.2.2-19 + "@polkadot/util": ^4.2.2-21 + "@polkadot/util-crypto": ^4.2.2-21 "@polkadot/x-rxjs": 2.10.2-16 "@types/bn.js": ^4.11.6 - "@types/memoizee": ^0.4.5 bn.js: ^4.11.9 - memoizee: ^0.4.14 languageName: unknown linkType: soft -"@polkadot/util-crypto@npm:4.2.2-19, @polkadot/util-crypto@npm:^4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/util-crypto@npm:4.2.2-19" +"@polkadot/util-crypto@npm:4.2.2-21, @polkadot/util-crypto@npm:^4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/util-crypto@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/networks": 4.2.2-19 - "@polkadot/util": 4.2.2-19 + "@polkadot/networks": 4.2.2-21 + "@polkadot/util": 4.2.2-21 "@polkadot/wasm-crypto": ^3.0.1 - "@polkadot/x-randomvalues": 4.2.2-19 + "@polkadot/x-randomvalues": 4.2.2-21 base-x: ^3.0.8 blakejs: ^1.1.0 bn.js: ^4.11.9 @@ -1985,23 +1981,23 @@ __metadata: tweetnacl: ^1.0.3 xxhashjs: ^0.2.2 peerDependencies: - "@polkadot/util": 4.2.2-19 - checksum: 3ccd43dc4f046d5a96de094e98dd970ae5b4f2e897f3dec8c14091d5fbadbcb64ad1ca3dca69c8ecb405cc5c663a7ea6cc1695b446a173829c6189fb564199a4 + "@polkadot/util": 4.2.2-21 + checksum: 4811219717d3a02f3fd1a4c8ef0d68b07939b35a57885d84ccb42a87abc77285cc3282195fd56bb26ba615793ddbed7245d8787007738bdfc0d6ce4018c4e791 languageName: node linkType: hard -"@polkadot/util@npm:4.2.2-19, @polkadot/util@npm:^4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/util@npm:4.2.2-19" +"@polkadot/util@npm:4.2.2-21, @polkadot/util@npm:^4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/util@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/x-textdecoder": 4.2.2-19 - "@polkadot/x-textencoder": 4.2.2-19 + "@polkadot/x-textdecoder": 4.2.2-21 + "@polkadot/x-textencoder": 4.2.2-21 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 camelcase: ^5.3.1 ip-regex: ^4.2.0 - checksum: f0931a46577368511ce9cae21679493c4c1955204aabc67aa2d23561e42860f8a57680a738928a3519cb1b3a2845bef367431861daba05d223be63005cc259ae + checksum: 3c3dcf1fd383db94967f41ce4584ba871da598fc23ce590f02427d0b94dea70a340fab27bc4fcf6587e14d8f62bf3f18e11615a0a9141f45a6f976be5fe62dfd languageName: node linkType: hard @@ -2038,23 +2034,23 @@ __metadata: languageName: node linkType: hard -"@polkadot/x-fetch@npm:^4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/x-fetch@npm:4.2.2-19" +"@polkadot/x-fetch@npm:^4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/x-fetch@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 "@types/node-fetch": ^2.5.7 node-fetch: ^2.6.1 - checksum: 305ce8a46c2b980395a004abe0d6bffcdda6ace1f21ac526c3dd7acd5a705d23ff0ec902a929f210a4e51720cc7ee1536556505530065b0b30a208580c5d9b3e + checksum: 142acbc5ba3860a478a13b90eeeda8cd70b2fdcbcc431f9bf04a25228908589d7583db5b4eab55bc9cd57ee6c17157cfcbb5f4c4cdd88fe9ee7cdd5cdd37c089 languageName: node linkType: hard -"@polkadot/x-randomvalues@npm:4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/x-randomvalues@npm:4.2.2-19" +"@polkadot/x-randomvalues@npm:4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/x-randomvalues@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - checksum: e60ce7e9fc46facd0199ce526bb5f31def4f0a48e48c065e43c2c0bf20fd683274999e18b4b6c4981958205f72d16e0a5b5b0630c67700c80cbc7e44b13a3817 + checksum: 9e6d3d376d2b4354e18bd7294222bd36d8ab8bc87110ee5fbebf9bb9d421f225f07305d9db3312bac3c7bc016e0819e5cef6eea8c39707bd20f22b605fc47e50 languageName: node linkType: hard @@ -2067,32 +2063,32 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/x-textdecoder@npm:4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/x-textdecoder@npm:4.2.2-19" +"@polkadot/x-textdecoder@npm:4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/x-textdecoder@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - checksum: 78dc9d383d2d085d0f8fc23005a85e9f54f731edc3f2da0154e2c3e4646df18be1e79c772a3d463016ac238406ec1ae8cf697a163827b9417ad5159853c5d37e + checksum: b93ec82977938d28c4fd986caa00d7022532ff0d6917744ad9b824d8792c18ac4cd9b720fd70a114810fb76bea12bd9d22d5d6c35092f6f6af6fe1269ada0ff5 languageName: node linkType: hard -"@polkadot/x-textencoder@npm:4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/x-textencoder@npm:4.2.2-19" +"@polkadot/x-textencoder@npm:4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/x-textencoder@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 - checksum: a3a08ea097fd6b33ed836e637c652386a30ada7320eba0d159d3fcc2e624bb4534c8c551875b0498740433d5f1bb12ee893cc19aa303cce039c2526be0327368 + checksum: d946b891b5a4a1dd4ed050d330e0a7097ee71442d8317492625a0bdee2518200bf4446e17bf361c902f0485c73f3a47703a144c6ed30d8ac8714ab05b4c4f484 languageName: node linkType: hard -"@polkadot/x-ws@npm:^4.2.2-19": - version: 4.2.2-19 - resolution: "@polkadot/x-ws@npm:4.2.2-19" +"@polkadot/x-ws@npm:^4.2.2-21": + version: 4.2.2-21 + resolution: "@polkadot/x-ws@npm:4.2.2-21" dependencies: "@babel/runtime": ^7.12.5 "@types/websocket": ^1.0.1 websocket: ^1.0.33 - checksum: ea15bfd3d25cb6151d177ae1890ebbfe2d4d1efcd9a4f8d0a2e7c004037c7a00441d5aaa92c95f2fcf40f10429abb962b0de7ab5b622513f716bb4e05874ecbe + checksum: 5a7b0e04c8adfe914ef01e1d31e463b23215cf3bf0dda6325807861747ac80bed942dbaacb2a1e43d938d81671251472cc7d2a60af4d730cef4d457eadb1858b languageName: node linkType: hard @@ -2287,13 +2283,6 @@ __metadata: languageName: node linkType: hard -"@types/memoizee@npm:^0.4.5": - version: 0.4.5 - resolution: "@types/memoizee@npm:0.4.5" - checksum: 8e5891a0ef7bc485751312ded849a0439c62551fb62e1440e358bcf78ea79db2f578b63591b828269bac8b34d0f5a24663ce9c58703be1bcafe9467fe8ce0483 - languageName: node - linkType: hard - "@types/node-fetch@npm:^2.5.7": version: 2.5.7 resolution: "@types/node-fetch@npm:2.5.7" @@ -4341,7 +4330,7 @@ __metadata: languageName: node linkType: hard -"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.45, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.50, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46": +"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.50": version: 0.10.53 resolution: "es5-ext@npm:0.10.53" dependencies: @@ -4352,7 +4341,7 @@ __metadata: languageName: node linkType: hard -"es6-iterator@npm:^2.0.3, es6-iterator@npm:~2.0.3": +"es6-iterator@npm:~2.0.3": version: 2.0.3 resolution: "es6-iterator@npm:2.0.3" dependencies: @@ -4373,18 +4362,6 @@ __metadata: languageName: node linkType: hard -"es6-weak-map@npm:^2.0.2": - version: 2.0.3 - resolution: "es6-weak-map@npm:2.0.3" - dependencies: - d: 1 - es5-ext: ^0.10.46 - es6-iterator: ^2.0.3 - es6-symbol: ^3.1.1 - checksum: 8dfd50b2919e16cf246ea9d5f9271eef466924248bc98a48a718cc149d0f67b708628c8e4bd32fa945a813c7780f94270f21ac16fff33c854a348db7e19f084d - languageName: node - linkType: hard - "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -4721,16 +4698,6 @@ __metadata: languageName: node linkType: hard -"event-emitter@npm:^0.3.5": - version: 0.3.5 - resolution: "event-emitter@npm:0.3.5" - dependencies: - d: 1 - es5-ext: ~0.10.14 - checksum: 92107b89703222355070b8c49208baf9426ce015d54b646a80f6652d348ab6064c5e13f1756ae20c750d8368f4b3cde48bafc56484667ba0e12d07c50b645f21 - languageName: node - linkType: hard - "eventemitter3@npm:^4.0.7": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -6275,13 +6242,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"is-promise@npm:^2.1": - version: 2.2.2 - resolution: "is-promise@npm:2.2.2" - checksum: 6fe84293b8750d3604a909979a7517a38b1618817f1fbbfdaf4d6138642117c85fbee12927b4d51349a5bcd9bdf8d1bf181f09145ede2d7eb41f4b394ab2ce7d - languageName: node - linkType: hard - "is-regex@npm:^1.1.1": version: 1.1.1 resolution: "is-regex@npm:1.1.1" @@ -7374,15 +7334,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"lru-queue@npm:0.1": - version: 0.1.0 - resolution: "lru-queue@npm:0.1.0" - dependencies: - es5-ext: ~0.10.2 - checksum: 2eab98cdfb3101dab91ef6b8b50fce616440fa29d27ef1a1b99aa6be13422d03d6ebee15c1eb4873971c34baee27d64376aebc64560aecb37a328c82e3f40169 - languageName: node - linkType: hard - "lunr@npm:^2.3.9": version: 2.3.9 resolution: "lunr@npm:2.3.9" @@ -7486,22 +7437,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"memoizee@npm:^0.4.14": - version: 0.4.14 - resolution: "memoizee@npm:0.4.14" - dependencies: - d: 1 - es5-ext: ^0.10.45 - es6-weak-map: ^2.0.2 - event-emitter: ^0.3.5 - is-promise: ^2.1 - lru-queue: 0.1 - next-tick: 1 - timers-ext: ^0.1.5 - checksum: 89530bbed2a59f20dd115d743f17159e0f857bd83186e5ffcfa6a4b88f47a6173472f351c7ae2219c4993c2888103e3ac348959356a104b74aba195c2db47ee6 - languageName: node - linkType: hard - "memory-fs@npm:^0.5.0": version: 0.5.0 resolution: "memory-fs@npm:0.5.0" @@ -7778,13 +7713,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"next-tick@npm:1": - version: 1.1.0 - resolution: "next-tick@npm:1.1.0" - checksum: 586cc85dcd8ec759b03269b39c8e3d899a27dbe49c472e7fb2b6a98b14a5b46d8c3b1b9a5fae29eb22881d9efa6d882d44617c51268b49d92e98ba8f20d42000 - languageName: node - linkType: hard - "next-tick@npm:~1.0.0": version: 1.0.0 resolution: "next-tick@npm:1.0.0" @@ -10175,16 +10103,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"timers-ext@npm:^0.1.5": - version: 0.1.7 - resolution: "timers-ext@npm:0.1.7" - dependencies: - es5-ext: ~0.10.46 - next-tick: 1 - checksum: 4593b57c397934fc7ddf7b240a8ff8468cdd7006407a442ec48c291bd85dcb7268858b72d1132bc55309e29d8eeae796f9edf378b0b45feff56b51f350e723b6 - languageName: node - linkType: hard - "tmp@npm:^0.0.33": version: 0.0.33 resolution: "tmp@npm:0.0.33"