From fdee04c6f5a3a8ff309fed5ca7f16a0c65c24576 Mon Sep 17 00:00:00 2001 From: Zeke Mostov <32168567+emostov@users.noreply.github.com> Date: Wed, 6 Jan 2021 18:53:00 -0800 Subject: [PATCH] fix: Account for polkadot-js changes; Harden `createCalcFee` (#376) * fix: Account for polkadot-js number serialization change; Add log message to calc * Update mock api to use codec types for weightToFee * fix spacing * Update README.md Co-authored-by: David * Cast to AbstractInt; Spacing Co-authored-by: David --- README.md | 2 +- calc/Cargo.lock | 2 +- calc/Cargo.toml | 2 +- calc/pkg/calc.js | 73 ++ calc/pkg/calc_bg.wasm | Bin 122268 -> 123483 bytes calc/pkg/package.json | 2 +- calc/src/calc_fee.rs | 4 + package.json | 20 +- src/services/blocks/BlocksService.ts | 30 +- src/services/test-helpers/mock/mockApi.ts | 6 +- yarn.lock | 880 +++++++++++----------- 11 files changed, 563 insertions(+), 458 deletions(-) diff --git a/README.md b/README.md index 1f5839563..a7d922b21 100644 --- a/README.md +++ b/README.md @@ -193,7 +193,7 @@ the console. Because this fee calculation happens in the statically compiled web a re-compile with the proper environment variable set is necessary: ```bash -CALC_DEBUG=1 yarn +CALC_DEBUG=1 sh calc/build.sh ``` ## Available endpoints diff --git a/calc/Cargo.lock b/calc/Cargo.lock index 1334ce361..e8c4b4440 100644 --- a/calc/Cargo.lock +++ b/calc/Cargo.lock @@ -32,7 +32,7 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "calc" -version = "0.1.3" +version = "0.1.4" dependencies = [ "console_error_panic_hook", "console_log", diff --git a/calc/Cargo.toml b/calc/Cargo.toml index 903d1106a..c160f279e 100644 --- a/calc/Cargo.toml +++ b/calc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "calc" -version = "0.1.3" +version = "0.1.4" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/calc/pkg/calc.js b/calc/pkg/calc.js index 59899440d..80a5ad1ed 100644 --- a/calc/pkg/calc.js +++ b/calc/pkg/calc.js @@ -36,6 +36,71 @@ function getInt32Memory0() { return cachegetInt32Memory0; } +function debugString(val) { + // primitive types + const type = typeof val; + if (type == 'number' || type == 'boolean' || val == null) { + return `${val}`; + } + if (type == 'string') { + return `"${val}"`; + } + if (type == 'symbol') { + const description = val.description; + if (description == null) { + return 'Symbol'; + } else { + return `Symbol(${description})`; + } + } + if (type == 'function') { + const name = val.name; + if (typeof name == 'string' && name.length > 0) { + return `Function(${name})`; + } else { + return 'Function'; + } + } + // objects + if (Array.isArray(val)) { + const length = val.length; + let debug = '['; + if (length > 0) { + debug += debugString(val[0]); + } + for(let i = 1; i < length; i++) { + debug += ', ' + debugString(val[i]); + } + debug += ']'; + return debug; + } + // Test for built-in + const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); + let className; + if (builtInMatches.length > 1) { + className = builtInMatches[1]; + } else { + // Failed to match the standard '[object ClassName]' + return toString.call(val); + } + if (className == 'Object') { + // we're a user defined class or Object + // JSON.stringify avoids problems with cycles, and is generally much + // easier than looping through ownProperties of `val`. + try { + return 'Object(' + JSON.stringify(val) + ')'; + } catch (_) { + return 'Object'; + } + } + // errors + if (val instanceof Error) { + return `${val.name}: ${val.message}\n${val.stack}`; + } + // TODO we could test for more things here, like `Set`s and `Map`s. + return className; +} + let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); cachedTextDecoder.decode(); @@ -194,6 +259,14 @@ module.exports.__wbindgen_json_serialize = function(arg0, arg1) { getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; +module.exports.__wbindgen_debug_string = function(arg0, arg1) { + var ret = debugString(getObject(arg1)); + var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; +}; + module.exports.__wbindgen_throw = function(arg0, arg1) { throw new Error(getStringFromWasm0(arg0, arg1)); }; diff --git a/calc/pkg/calc_bg.wasm b/calc/pkg/calc_bg.wasm index cfbaa3bed4462231b4f5cb3f3d0a37be193e6c79..2729e0cf49f24301edc81262a922e51e12564adf 100644 GIT binary patch delta 34718 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%0AmpoOS=Ql@pYH`&Qg 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 delta 33904 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" ], "description": "Off-chain calculations for @substrate/api-sidecar.", - "version": "0.1.3", + "version": "0.1.4", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/calc/src/calc_fee.rs b/calc/src/calc_fee.rs index 04e00c2da..594a3fca2 100644 --- a/calc/src/calc_fee.rs +++ b/calc/src/calc_fee.rs @@ -98,6 +98,10 @@ impl CalcFee { spec_version: u32, ) -> Option { debug::setup(); + info!( + "CalcFee::from_params({:#?}, {}, {}, {}, {}, {})", + polynomial, extrinsic_base_weight, multiplier, per_byte_fee, spec_name, spec_version + ); let polynomial: Vec = { let poly: Option> = polynomial.into_serde().unwrap(); diff --git a/package.json b/package.json index f233bbaba..957c89dc2 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,9 @@ "test": "jest --silent" }, "dependencies": { - "@polkadot/api": "^3.0.1", - "@polkadot/apps-config": "^0.71.2", - "@polkadot/util-crypto": "^5.0.1", + "@polkadot/api": "^3.3.1", + "@polkadot/apps-config": "^0.74.1", + "@polkadot/util-crypto": "^5.2.3", "@substrate/calc": "^0.1.3", "confmgr": "^1.0.6", "express": "^4.17.1", @@ -53,16 +53,16 @@ "@types/jest": "^26.0.19", "@types/morgan": "^1.9.2", "@types/triple-beam": "^1.3.2", - "@typescript-eslint/eslint-plugin": "4.10.0", - "@typescript-eslint/parser": "4.10.0", - "eslint": "^7.15.0", - "eslint-config-prettier": "^7.0.0", - "eslint-plugin-prettier": "^3.3.0", + "@typescript-eslint/eslint-plugin": "4.12.0", + "@typescript-eslint/parser": "4.12.0", + "eslint": "^7.17.0", + "eslint-config-prettier": "^7.1.0", + "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-simple-import-sort": "^7.0.0", "jest": "^26.6.3", "prettier": "^2.2.1", "rimraf": "^3.0.2", - "standard-version": "^9.0.0", + "standard-version": "^9.1.0", "ts-jest": "^26.4.4", "tsc-watch": "^4.2.9", "typescript": "^4.1.3" @@ -70,7 +70,7 @@ "resolutions": { "node-forge": ">=0.10.0", "node-fetch": ">=2.6.1", - "prismjs": ">=1.21.1" + "prismjs": ">=1.23.0" }, "keywords": [ "substrate", diff --git a/src/services/blocks/BlocksService.ts b/src/services/blocks/BlocksService.ts index 93bcf9070..b6a5f9380 100644 --- a/src/services/blocks/BlocksService.ts +++ b/src/services/blocks/BlocksService.ts @@ -1,6 +1,7 @@ import { ApiPromise } from '@polkadot/api'; import { SignedBlockExtended } from '@polkadot/api-derive/type'; import { GenericCall, Struct } from '@polkadot/types'; +import { AbstractInt } from '@polkadot/types/codec/AbstractInt'; import { Block, BlockHash, @@ -222,15 +223,16 @@ export class BlocksService extends AbstractService { tip, } = extrinsic; const hash = u8aToHex(blake2AsU8a(extrinsic.toU8a(), 256)); + const call = block.registry.createType('Call', method); return { method: { - pallet: method.sectionName, - method: method.methodName, + pallet: method.section, + method: method.method, }, signature: isSigned ? { signature, signer } : null, nonce: isSigned ? nonce : null, - args: this.parseGenericCall(method, block.registry).args, + args: this.parseGenericCall(call, block.registry).args, tip: isSigned ? tip : null, hash, info: {}, @@ -338,7 +340,8 @@ export class BlocksService extends AbstractService { block: Block ) { const perByte = api.consts.transactionPayment?.transactionByteFee; - const extrinsicBaseWeight = api.consts.system?.extrinsicBaseWeight; + const extrinsicBaseWeight = api.consts.system + ?.extrinsicBaseWeight as AbstractInt; let calcFee, specName, specVersion; if ( @@ -360,9 +363,11 @@ export class BlocksService extends AbstractService { const coefficients = api.consts.transactionPayment.weightToFee.map( (c) => { return { - coeffInteger: c.coeffInteger.toString(), - coeffFrac: c.coeffFrac, - degree: c.degree, + // Anything that could overflow Number.MAX_SAFE_INTEGER needs to be serialized + // to BigInt or string. + coeffInteger: c.coeffInteger.toString(10), + coeffFrac: c.coeffFrac.toNumber(), + degree: c.degree.toNumber(), negative: c.negative, }; } @@ -392,9 +397,9 @@ export class BlocksService extends AbstractService { calcFee = CalcFee.from_params( coefficients, - BigInt(extrinsicBaseWeight.toString()), - multiplier.toString(), - perByte.toString(), + extrinsicBaseWeight.toBigInt(), + multiplier.toString(10), + perByte.toString(10), specName, specVersion ); @@ -455,7 +460,6 @@ export class BlocksService extends AbstractService { genericCall: GenericCall, registry: Registry ): ISanitizedCall { - const { sectionName, methodName } = genericCall; const newArgs = {}; // Pull out the struct of arguments to this call @@ -503,8 +507,8 @@ export class BlocksService extends AbstractService { return { method: { - pallet: sectionName, - method: methodName, + pallet: genericCall.section, + method: genericCall.method, }, args: newArgs, }; diff --git a/src/services/test-helpers/mock/mockApi.ts b/src/services/test-helpers/mock/mockApi.ts index 7235f833c..c377291e6 100644 --- a/src/services/test-helpers/mock/mockApi.ts +++ b/src/services/test-helpers/mock/mockApi.ts @@ -330,9 +330,9 @@ export const mockApi = ({ transactionByteFee: polkadotRegistry.createType('Balance', 1000000), weightToFee: [ { - coeffFrac: 80000000, - coeffInteger: 0, - degree: 1, + coeffFrac: polkadotRegistry.createType('Perbill', 80000000), + coeffInteger: polkadotRegistry.createType('Balance', 0), + degree: polkadotRegistry.createType('u8', 1), negative: false, }, ], diff --git a/yarn.lock b/yarn.lock index 5652329bc..94843148c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,14 +2,14 @@ # yarn lockfile v1 -"@acala-network/type-definitions@^0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@acala-network/type-definitions/-/type-definitions-0.5.1.tgz#b716d27237c620d2b1e203c3ab394b96d3403be5" - integrity sha512-hWd1BOGx5HlD/TDff/xzirbfgB0SpOp7d6PfVxVGxnY3RyxV1k76LRbPKsoBKe/DtSrr1/1H+s55GxpJt4jcPg== +"@acala-network/type-definitions@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@acala-network/type-definitions/-/type-definitions-0.6.1.tgz#d850dd030c045e3f49c1b71183e79a624084303f" + integrity sha512-bh2e8GkNWhM3qsIpYqZ6ABXxWTokjaCnxCs+X8BKjBlVcuODBEj6Q3VHanTuyvoJVG6SRcUxsHvNm9utzdWHQQ== dependencies: - "@open-web3/orml-type-definitions" "^0.8.2-2" + "@open-web3/orml-type-definitions" "^0.8.2-4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== @@ -37,7 +37,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.10": +"@babel/generator@^7.12.10", "@babel/generator@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== @@ -46,7 +46,7 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-function-name@^7.10.4": +"@babel/helper-function-name@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== @@ -120,7 +120,7 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-split-export-declaration@^7.11.0": +"@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== @@ -150,7 +150,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== @@ -263,24 +263,24 @@ "@babel/types" "^7.12.7" "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" - integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.10" - "@babel/types" "^7.12.10" + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" + integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== + dependencies: + "@babel/code-frame" "^7.12.11" + "@babel/generator" "^7.12.11" + "@babel/helper-function-name" "^7.12.11" + "@babel/helper-split-export-declaration" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/types" "^7.12.12" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce" - integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" + integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -329,6 +329,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@interlay/polkabtc-types@^0.2.9": + version "0.2.9" + resolved "https://registry.yarnpkg.com/@interlay/polkabtc-types/-/polkabtc-types-0.2.9.tgz#4ab078bf57822f6a3245b223caed95f5316165bf" + integrity sha512-UqtyQ2N+SPXCGdW8/uu3L6TFY3dS2ACJSUGxixxsmwSMtKS0Gnmc0+GE2F1IinUKIP0g17ZS7RA3LN1J0NxLAw== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -523,25 +528,25 @@ dependencies: "@open-web3/orml-type-definitions" "^0.6.0-beta.26" -"@nodelib/fs.scandir@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" - integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== +"@nodelib/fs.scandir@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: - "@nodelib/fs.stat" "2.0.3" + "@nodelib/fs.stat" "2.0.4" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" - integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" - integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: - "@nodelib/fs.scandir" "2.1.3" + "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" "@open-web3/orml-type-definitions@^0.6.0-beta.26": @@ -549,144 +554,146 @@ resolved "https://registry.yarnpkg.com/@open-web3/orml-type-definitions/-/orml-type-definitions-0.6.1.tgz#eb7fadf598f24f5024f5d2a1fd39ccc97c801104" integrity sha512-6asf2W/sluGQ6LNiGSdCg/Xop54mq/Q2FcV2Z9cBxys6QC4qXfo4JwUL6kJsRh/vcIIbUxoyGgKUrU/6Xdm7wA== -"@open-web3/orml-type-definitions@^0.8.2-2": - version "0.8.2-4" - resolved "https://registry.yarnpkg.com/@open-web3/orml-type-definitions/-/orml-type-definitions-0.8.2-4.tgz#852a16cf4b7b4d78d0c74e116375391213f074d7" - integrity sha512-2PfltpT6hX7kCUomwceQWWXenQuPaNj23/DwwD9HRsV3qEMJl9idQ4Ncu+X4XXe5rGzOdugRK4xcfyMa63hv0A== +"@open-web3/orml-type-definitions@^0.8.2-4": + version "0.8.2-5" + resolved "https://registry.yarnpkg.com/@open-web3/orml-type-definitions/-/orml-type-definitions-0.8.2-5.tgz#f65b000affdb207a71f35adc9a7d10a8141a6eb7" + integrity sha512-o/o7ucy4RkuQ5oZgGMBc7t7UuaTK/+rG6QHE7+ZPCRG6cnYzg6ZZ9pApOTmzG0e47k0GUZDg0m+IYzltgwJRMQ== -"@polkadot/api-derive@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-3.0.1.tgz#99eeb05dc06a556133acafe84f70f15877c31d94" - integrity sha512-F+6jN0Tf4XgtZrifm+FtKUmgjEWc8sjNDpeWVz/siD8pPc2a1ZHn6VABOrAR4EpUqnw78fPcJvMBnPOrL/Mf+A== +"@polkadot/api-derive@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-3.3.1.tgz#a091556074caa80bd941711eb1c3c4b6102c6cf9" + integrity sha512-q31gxAitW9XKTBpGxJ2pywtQ9QddRZJzgj4mpBAIXVF+CHsOtmM+nvwHtZRE4FiaVQAhvgoWij3ARLfH5eRV2g== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/api" "3.0.1" - "@polkadot/rpc-core" "3.0.1" - "@polkadot/types" "3.0.1" - "@polkadot/util" "^5.0.1" - "@polkadot/util-crypto" "^5.0.1" - "@polkadot/x-rxjs" "3.0.1" + "@polkadot/api" "3.3.1" + "@polkadot/rpc-core" "3.3.1" + "@polkadot/types" "3.3.1" + "@polkadot/util" "^5.2.3" + "@polkadot/util-crypto" "^5.2.3" + "@polkadot/x-rxjs" "3.3.1" bn.js "^4.11.9" -"@polkadot/api@3.0.1", "@polkadot/api@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-3.0.1.tgz#d096d653f444f5619f5810c3a16b169269329b15" - integrity sha512-hn2pgFZjgU0DX/PfjpqlpIVwgzzTbYKOHx+FGSD2vMIsDIvwyD3CpHtGdeEHJRGfU44TzRjHawhHfUwE4hnFng== +"@polkadot/api@3.3.1", "@polkadot/api@^3.2.3", "@polkadot/api@^3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-3.3.1.tgz#4ccf614033a684633ac6abf5390eb0e2120659ba" + integrity sha512-52n7ZSOBD/JNEaKqtI4+G4PCMbrrVzl/sQZhjEV+OCdx0XMwf3Zm7f2X6zukLSo0zoHrBYBKWekN+xR2GHH1Tg== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/api-derive" "3.0.1" - "@polkadot/keyring" "^5.0.1" - "@polkadot/metadata" "3.0.1" - "@polkadot/rpc-core" "3.0.1" - "@polkadot/rpc-provider" "3.0.1" - "@polkadot/types" "3.0.1" - "@polkadot/types-known" "3.0.1" - "@polkadot/util" "^5.0.1" - "@polkadot/util-crypto" "^5.0.1" - "@polkadot/x-rxjs" "3.0.1" + "@polkadot/api-derive" "3.3.1" + "@polkadot/keyring" "^5.2.3" + "@polkadot/metadata" "3.3.1" + "@polkadot/rpc-core" "3.3.1" + "@polkadot/rpc-provider" "3.3.1" + "@polkadot/types" "3.3.1" + "@polkadot/types-known" "3.3.1" + "@polkadot/util" "^5.2.3" + "@polkadot/util-crypto" "^5.2.3" + "@polkadot/x-rxjs" "3.3.1" bn.js "^4.11.9" eventemitter3 "^4.0.7" -"@polkadot/apps-config@^0.71.2": - version "0.71.2" - resolved "https://registry.yarnpkg.com/@polkadot/apps-config/-/apps-config-0.71.2.tgz#150fa2b0f4c6848967787d2292e903bcc40e212e" - integrity sha512-MTkSsstmY67691qZbwY8zkySG6XWzdc4RtS8b8sHV1B8YHUGgENA54L4Gn82A+0ndLnKZw1eSpLrceobPpImbw== +"@polkadot/apps-config@^0.74.1": + version "0.74.1" + resolved "https://registry.yarnpkg.com/@polkadot/apps-config/-/apps-config-0.74.1.tgz#1f647712c07e969e0b78f7819757efbe5be66de1" + integrity sha512-S8xIAahKK/eizcIDwB7k/dIfZvRz2uezDlsNn/mPvAYiyUbFJTVDmlsXwhqKnASmyb1CJLxNkhEZJ7oO387SLw== dependencies: - "@acala-network/type-definitions" "^0.5.1" + "@acala-network/type-definitions" "^0.6.1" "@babel/runtime" "^7.12.5" "@edgeware/node-types" "^3.0.11" + "@interlay/polkabtc-types" "^0.2.9" "@laminar/type-definitions" "^0.2.0-beta.141" - "@polkadot/networks" "^5.0.1" - "@sora-substrate/type-definitions" "^0.1.8" - "@subsocial/types" "^0.4.26" + "@polkadot/networks" "^5.2.3" + "@sora-substrate/type-definitions" "^0.3.1" + "@subsocial/types" "^0.4.27" + moonbeam-types-bundle "^1.0.1" -"@polkadot/keyring@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-5.0.1.tgz#698b9918d43395bbc47ca317772ec1cbe899680e" - integrity sha512-TZz5HrSzmGlWNFmvT4ewdDFT2DdCCgS1sRZtfMGvJq4AtJTNLDKe7twUKphiNjuaIaiIbHJLvs4Wnhmu0MBRxw== +"@polkadot/keyring@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-5.2.3.tgz#b555424a553b945893b107d7cf6dd1cf8599465f" + integrity sha512-IypWNJkZ+NaaYA/lMNqt1eQu+4Pwmi8KitDWwRaZIqeL8pjHzvoRoUN9qqEU504Ohbbe1Z9OE2CtSK2r41QP9g== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/util" "5.0.1" - "@polkadot/util-crypto" "5.0.1" + "@polkadot/util" "5.2.3" + "@polkadot/util-crypto" "5.2.3" -"@polkadot/metadata@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-3.0.1.tgz#63215860cc2eee4788a58d69eda00c78c3a172d4" - integrity sha512-GqAi++2K2gWl9CNKCAl+kzY0WM9zqyKUJYxqGDDf/+AfnxMlo6DVfy3hO8oRNpe/DzILIkx9mpYz2xsBJshk3Q== +"@polkadot/metadata@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-3.3.1.tgz#255b8a0b62378c755fa7eb8452499a0cca86ed92" + integrity sha512-Ebzm+ctbp1mzol1e6C8ECG7NdLzeL4gQKxa1ilKF+wm2kiFwvzrxV21tYmvNI7I3IKMeHT0+X3pRlzUFyfXjSw== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/types" "3.0.1" - "@polkadot/types-known" "3.0.1" - "@polkadot/util" "^5.0.1" - "@polkadot/util-crypto" "^5.0.1" + "@polkadot/types" "3.3.1" + "@polkadot/types-known" "3.3.1" + "@polkadot/util" "^5.2.3" + "@polkadot/util-crypto" "^5.2.3" bn.js "^4.11.9" -"@polkadot/networks@5.0.1", "@polkadot/networks@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-5.0.1.tgz#757d5fa79296d600b5be7360dd088e6038ca6bad" - integrity sha512-RgGT5gMsT8zSiFQPI87lnz3nVNhgDArTdm+Y6wGVgrD+SNy/XcPLf3iO8xc2n+bMVmQfB5QzEZugwxE3nLJ4PA== +"@polkadot/networks@5.2.3", "@polkadot/networks@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-5.2.3.tgz#c14de05995636391514220c40f4e0373ffacbaa9" + integrity sha512-lDS34KyyIGkxh0Hm8LkZUAB8Rk6BLGd4YeUWy2HyeEj5AvD0t9EC95SMPgMGEfwsmBdF1IWIEV6fL5dnidL94w== dependencies: "@babel/runtime" "^7.12.5" -"@polkadot/rpc-core@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-3.0.1.tgz#3ef91cf070786fa304a327c311f1ff079b1cd8c4" - integrity sha512-q0HqI2goxh/ex3lgFmn3Te9zQFZoxGhnsfD1fbhvPz2Q9Qao3FInqC6mibhYdB9boni5kb4lRp2dNpVuawJmAQ== +"@polkadot/rpc-core@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-3.3.1.tgz#60233fea680483a76af0d68d618eb2095b53e562" + integrity sha512-OBQZl1PNlLTMG1vte6YXwfC7HJqqyQSGLaxS1xJUFJVdIN9txwbsrrqbhgYwWfsWdacFZ11r/rB0HfZ89zdqDg== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/metadata" "3.0.1" - "@polkadot/rpc-provider" "3.0.1" - "@polkadot/types" "3.0.1" - "@polkadot/util" "^5.0.1" - "@polkadot/x-rxjs" "3.0.1" + "@polkadot/metadata" "3.3.1" + "@polkadot/rpc-provider" "3.3.1" + "@polkadot/types" "3.3.1" + "@polkadot/util" "^5.2.3" + "@polkadot/x-rxjs" "3.3.1" -"@polkadot/rpc-provider@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-3.0.1.tgz#fd850277282381ea0360ba2f10ba59a7fadd8a28" - integrity sha512-SgJB/VBE7rczBNtxlPfk2Xf937Bsj+fdgfVuaqWGhbFftxatUNCX5oyXDle9uORPeYTgmY5erApglu+86rRFfA== +"@polkadot/rpc-provider@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-3.3.1.tgz#5120b67bbd054804b13092cfe20abbc3479b376b" + integrity sha512-uniicLPOWGOr0mEgr3KO56ryUTcu+6Fe6vhTpklguB3J7uO2/hIaMpCPN3Yb1xUQ5buQIkp16YVr7SF3pL4PWQ== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/types" "3.0.1" - "@polkadot/util" "^5.0.1" - "@polkadot/util-crypto" "^5.0.1" - "@polkadot/x-fetch" "^5.0.1" - "@polkadot/x-ws" "^5.0.1" + "@polkadot/types" "3.3.1" + "@polkadot/util" "^5.2.3" + "@polkadot/util-crypto" "^5.2.3" + "@polkadot/x-fetch" "^5.2.3" + "@polkadot/x-ws" "^5.2.3" bn.js "^4.11.9" eventemitter3 "^4.0.7" -"@polkadot/types-known@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-3.0.1.tgz#c1e99236b2238e27c5e419456e66008854f3cdb4" - integrity sha512-t7TAHF/PuX4fa9WS7GmtlQAsgTwdz7KEfe6Cs4JqZCY0ECpgQ44/Jj8N2BOTwtjeSowMtXjKK1bxBB50loBysQ== +"@polkadot/types-known@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-3.3.1.tgz#ef5ee5c46cefdb9c050726e1b1072c0510dc52b0" + integrity sha512-foOt/NgYqerqvs7PNlfyNWYKym0CQvrDuF7SkZewW5Y1XF4Ulx60A3pXOfUNwCRHuN9PB/JI/D3g9Fth3Tr0eg== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/types" "3.0.1" - "@polkadot/util" "^5.0.1" + "@polkadot/types" "3.3.1" + "@polkadot/util" "^5.2.3" bn.js "^4.11.9" -"@polkadot/types@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-3.0.1.tgz#87ca9a20e1c9f49ed7c56ab66994e6e6db843b18" - integrity sha512-FjU/G9fbBsA+HgmzkYlcnFfqyoN+QQG6CcFRlV6WN/HuU0SjQLPmVswn9mXYYzcdlTW3DdYL2RxBWeyrynRTTQ== +"@polkadot/types@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-3.3.1.tgz#bd94296b1f116ef52e531c1d7d5130626116b099" + integrity sha512-Qba8dqyTAZLbep1hCq9gkXmzOp28BXc6fsD7X5+9kibv3/L0ZKHbmKmoDDM4OsBX5Ar04AuxKomR77FJR1FymQ== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/metadata" "3.0.1" - "@polkadot/util" "^5.0.1" - "@polkadot/util-crypto" "^5.0.1" - "@polkadot/x-rxjs" "3.0.1" + "@polkadot/metadata" "3.3.1" + "@polkadot/util" "^5.2.3" + "@polkadot/util-crypto" "^5.2.3" + "@polkadot/x-rxjs" "3.3.1" "@types/bn.js" "^4.11.6" bn.js "^4.11.9" -"@polkadot/util-crypto@5.0.1", "@polkadot/util-crypto@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-5.0.1.tgz#87ef8a14e133a169b7d5dba109f0bd7460d3a8bd" - integrity sha512-lZHDnbchNJxvMh8NnRoRZtazgn6dGSiXVwHgygVm3EkEw/30ULdT5eyD9PhTbYxeNxfoHmSGHugUhfNmlyYSuw== +"@polkadot/util-crypto@5.2.3", "@polkadot/util-crypto@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-5.2.3.tgz#36dd46c6a494da36a6994d92a93f7974d47b1a4f" + integrity sha512-gU52s/TDhr48L9QMMCNyb5pRRwmc2TRC8aVpcBGklOY0gOUzAliZP8P8NpLAjQJuPINwYh3aPhQtbB0PVn0ONA== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/networks" "5.0.1" - "@polkadot/util" "5.0.1" - "@polkadot/wasm-crypto" "^3.0.1" - "@polkadot/x-randomvalues" "5.0.1" + "@polkadot/networks" "5.2.3" + "@polkadot/util" "5.2.3" + "@polkadot/wasm-crypto" "^3.1.1" + "@polkadot/x-randomvalues" "5.2.3" base-x "^3.0.8" blakejs "^1.1.0" bn.js "^4.11.9" @@ -698,85 +705,84 @@ tweetnacl "^1.0.3" xxhashjs "^0.2.2" -"@polkadot/util@5.0.1", "@polkadot/util@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-5.0.1.tgz#a3435b526632c897c8d721e2f71edf838db29f7c" - integrity sha512-XqAWE6ZZEDQkSqSpaJg8f2uKDdUZ3lhRWKnumO+7nj4k0alOp5tD4mc1Pd6KxdnkserNMV4KxeNQxfCSJ0pu/Q== +"@polkadot/util@5.2.3", "@polkadot/util@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-5.2.3.tgz#843712ca10456c1036b3a3cc01281709e5e58e97" + integrity sha512-5DC+iaSxLpwYluE3R1RIGqegxSU6PnmdyoPiAVC5ZNj31C8fE3U7E7lQguoeX4/2dIjaPC6zAbYLSAGLMjfxgA== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/x-textdecoder" "5.0.1" - "@polkadot/x-textencoder" "5.0.1" + "@polkadot/x-textdecoder" "5.2.3" + "@polkadot/x-textencoder" "5.2.3" "@types/bn.js" "^4.11.6" bn.js "^4.11.9" camelcase "^5.3.1" ip-regex "^4.2.0" -"@polkadot/wasm-crypto-asmjs@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-3.0.1.tgz#91d712a2aea0d59bc044376ed1dde70368c3c04f" - integrity sha512-PXdBDl28QDUKzFp63yP7b+zWTC1xseY9egjQmqjAZ0lRpIePwE2Z2SVhSXuCR9ejxxHGZZye+yELJ1djeOXoMg== +"@polkadot/wasm-crypto-asmjs@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-3.1.1.tgz#391e1be6f7d65552b09c2e2486d108c379e46dc6" + integrity sha512-7Lt4B/6dwUhb5OAuSes0qMd83TpkngvEpiXTt2ccf/t2OvAXY9msfeJ9as3dI2jvjA9edD//jiejJ0BHJgpuXw== dependencies: "@babel/runtime" "^7.12.5" -"@polkadot/wasm-crypto-wasm@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-3.0.1.tgz#b0b211188631bb4953625ca552842421941ddec3" - integrity sha512-qWcN3XDqYi7uAAPUaZIUnZDvFrJ3mU0WdoEWjF7iZYU1rDCA8mDRS09vfvTnECaNeIBS/2qZVs9oQPZtXMjKvg== +"@polkadot/wasm-crypto-wasm@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-3.1.1.tgz#94638daa7642e6a9681cb854757d98401913f087" + integrity sha512-KaP1Ojf889ZeXHGPmyFTj0Qxr/jQ4yfpaGiEOCvYKXRYsDsbZKfxcb96PFil/x0yoZswWG3TX2S3hebnAzkmBg== dependencies: "@babel/runtime" "^7.12.5" - fflate "^0.4.2" -"@polkadot/wasm-crypto@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-3.0.1.tgz#4e320e126704d0a793da9ea03686d8db17e3e613" - integrity sha512-4cbiaqnvd13D4bqJBOKSYtg0dRLXfhbQc/Ha59EC5wQ2JVItUyRC0FS5wfkrsOtlNIEn3rRa92jMdlYL0bg4IA== +"@polkadot/wasm-crypto@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-3.1.1.tgz#e9ec63204f508541dfda72f0b6b98be40e27de50" + integrity sha512-uApLRojJY9Q7Arji6w9/eOYEu8Pg8dm+zt+640QLzC4KVVCpbdMmrcFAXCZXeOIJwsKveZsNehGUCcG77ypVPg== dependencies: "@babel/runtime" "^7.12.5" - "@polkadot/wasm-crypto-asmjs" "^3.0.1" - "@polkadot/wasm-crypto-wasm" "^3.0.1" + "@polkadot/wasm-crypto-asmjs" "^3.1.1" + "@polkadot/wasm-crypto-wasm" "^3.1.1" -"@polkadot/x-fetch@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-5.0.1.tgz#f8835f75b517a6155bc8e43652248ff3b08569d4" - integrity sha512-mUEDEmqEKcV0yDJ0XTIaBYLLHurCpA2j76ffRI8YevscwLJJy+FUpm1IOIQr+VSGi5GfjLewY02jgG7dMSSDRA== +"@polkadot/x-fetch@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-5.2.3.tgz#ab12c9a941548e9b25f8f12ae98ccb4a6adc937c" + integrity sha512-hnIqryERejKKHRk429i1S9cyCuwnO8LkTJV7daEMoSQnQDQp8C1bmXW9WkN1UwwlbjBdYL3w7sSyU1Lp2akgAQ== dependencies: "@babel/runtime" "^7.12.5" "@types/node-fetch" "^2.5.7" node-fetch "^2.6.1" -"@polkadot/x-randomvalues@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-5.0.1.tgz#55232b34f0244cd2c94de63f56a8efc824948f2e" - integrity sha512-ynv3OzDdSs24QZSXCuhT7c0hYKO7M+9tHaUpsYTz6vbHFj16sLCi8XYNtQbgRk2bW4jf1J1R9d9Mek6y3FziCg== +"@polkadot/x-randomvalues@5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-5.2.3.tgz#139fbddf8a0dbc2be050a487c9850314afe94bdc" + integrity sha512-P8nJ0Q2ePOazazYSb2HHvBFSjHuS+aQFcEzNVayVa4DEZ4seisK6Qrzy1fAqiSvrmz8H4/Tuga9UoHVASwUILw== dependencies: "@babel/runtime" "^7.12.5" -"@polkadot/x-rxjs@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/x-rxjs/-/x-rxjs-3.0.1.tgz#e4049a304f36635e540240b4dfdcab8d0572c348" - integrity sha512-Foc6a/duyJx/+HbdMhbj4a1RmLl8BAOB5Mc8kyykCEQ+iHW6dmkUo/urQm7inR2KGnzaNwAoDVkFEy1oYyzm0w== +"@polkadot/x-rxjs@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@polkadot/x-rxjs/-/x-rxjs-3.3.1.tgz#e1ff305b5c96b1a696c632c49561bafb6b4ceb21" + integrity sha512-nmvAikDWSkChlqFzTHR5PX2wANVz8IepN9zO4QrgO4PmX3wT/ZykehsLtTXrVsOe95iuoZY4Qyvi9fcnNw0PTQ== dependencies: "@babel/runtime" "^7.12.5" rxjs "^6.6.3" -"@polkadot/x-textdecoder@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-5.0.1.tgz#34d6c189d0e143c9ddbc5aba10e803faec28c5bb" - integrity sha512-pQDO2OlzRgcXtdzopcdiSSvfJMTyI/l5vLX4VNLfxXSN4n3FTlZurPnHyPM7Tuigr9kMVwWoDMGNQYug8fCavA== +"@polkadot/x-textdecoder@5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-5.2.3.tgz#479a4f56ecab14ec6ddf006f02238a598694a2b4" + integrity sha512-fqDSm+kzzRPPhSG3H/tpngf4WtkEhkdESXcOGlr0oychvY2WP2kjBiVBIBJlg5SuAGj2CmBGnk1nYWxO5JW8bQ== dependencies: "@babel/runtime" "^7.12.5" -"@polkadot/x-textencoder@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-5.0.1.tgz#401a264f317111e25c8e45eb0efd686c1b6a37af" - integrity sha512-hMFLJ5Udi0boHE3rMt+IWZ+T2khuzHgsPGoaSIxvEiTFUU4tt+26fESiE+vy+gbHfMaUvSWirwW2EnC2lsn6tA== +"@polkadot/x-textencoder@5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-5.2.3.tgz#40d2cd2a9bc4adb3304e5ae9e04a27d670b85edc" + integrity sha512-TVwbU8A42pCRw15+X3uBMvp2GzQeF9LOFeqwXS5KZ899O+LoDqKpbmqySB1Qs+IncnWqMxO+Z1rQs6JnCpfh9w== dependencies: "@babel/runtime" "^7.12.5" -"@polkadot/x-ws@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-5.0.1.tgz#6d0a62dbee0058672c374488cba2400cec57a3e7" - integrity sha512-LrglkT8S17gMahkBKEoRkXAv5hEB1t31qthNuFzwCHst97tpPLDlrm3OdgC7vzGtAnVk22WHe6QnWjbCtGytPg== +"@polkadot/x-ws@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-5.2.3.tgz#288db6106df6f3e6258d9bd6ea19fb0064b38cda" + integrity sha512-IA8HyrYIWShi+PeeYQWCp+E6pMDOSPZGza63+6r+CF+XbIFsaUZKBgYWkTt5OVsrhnAM2RtkQjtsiPgwG1P3Mg== dependencies: "@babel/runtime" "^7.12.5" "@types/websocket" "^1.0.1" @@ -796,17 +802,17 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@sora-substrate/type-definitions@^0.1.8": - version "0.1.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-0.1.9.tgz#a52e812d16b0d4d6993bab3bb0c350cc7314581a" - integrity sha512-b0nRjDdE8BLAatiaNonAqzWA7kIYADzLPe+EzpUE3pfC31jmFMRxC45NJVrz/rEz2mlsN9wEvA6aWOZpPszuew== +"@sora-substrate/type-definitions@^0.3.1": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-0.3.2.tgz#206637c3790cb3bd251e2ca8ee105251231761ea" + integrity sha512-5/NofwSPjQpFWEPDhqhcGSYSdvU5n8P6M+6oazwlfljSeFXNmhnEY1ejhUKeDvMTfHgtwfD9tms4KfkPd8pn5Q== dependencies: "@open-web3/orml-type-definitions" "^0.6.0-beta.26" -"@subsocial/types@^0.4.26": - version "0.4.26" - resolved "https://registry.yarnpkg.com/@subsocial/types/-/types-0.4.26.tgz#5dae4939971a5b4acf10e90ebfa2672a2caca95d" - integrity sha512-jBYVsBowkx+yEtxQ4hZLT6mpkBy36MP31zIAUUDVQWdEp1esnr5ASRiU9SCwIDBEiZcZkv+tz+bRnuSZCr23Ag== +"@subsocial/types@^0.4.27": + version "0.4.27" + resolved "https://registry.yarnpkg.com/@subsocial/types/-/types-0.4.27.tgz#a5caad3c098f7bbe3d4b7f6d6513ffff97f6f721" + integrity sha512-tbfyWo1LbqAEVVh0ayRLdB3VV+48cHSOyXdyOH6qcB5E7UaB015hk8CY3gdyt1cYwfADOLHPc8ByP0LD4DA1Ng== dependencies: "@subsocial/utils" "^0.4.25" cids "^0.7.1" @@ -973,9 +979,9 @@ form-data "^3.0.0" "@types/node@*": - version "14.14.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" - integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== + version "14.14.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" + integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -983,9 +989,9 @@ integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== "@types/prettier@^2.0.0": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00" - integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ== + version "2.1.6" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03" + integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA== "@types/qs@*": version "6.9.5" @@ -1030,9 +1036,9 @@ yaml "*" "@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + version "20.2.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" + integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== "@types/yargs@^15.0.0": version "15.0.12" @@ -1041,61 +1047,61 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.10.0.tgz#19ed3baf4bc4232c5a7fcd32eaca75c3a5baf9f3" - integrity sha512-h6/V46o6aXpKRlarP1AiJEXuCJ7cMQdlpfMDrcllIgX3dFkLwEBTXAoNP98ZoOmqd1xvymMVRAI4e7yVvlzWEg== +"@typescript-eslint/eslint-plugin@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz#00d1b23b40b58031e6d7c04a5bc6c1a30a2e834a" + integrity sha512-wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q== dependencies: - "@typescript-eslint/experimental-utils" "4.10.0" - "@typescript-eslint/scope-manager" "4.10.0" + "@typescript-eslint/experimental-utils" "4.12.0" + "@typescript-eslint/scope-manager" "4.12.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.10.0.tgz#dbf5d0f89802d5feaf7d11e5b32df29bbc2f3a0e" - integrity sha512-opX+7ai1sdWBOIoBgpVJrH5e89ra1KoLrJTz0UtWAa4IekkKmqDosk5r6xqRaNJfCXEfteW4HXQAwMdx+jjEmw== +"@typescript-eslint/experimental-utils@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz#372838e76db76c9a56959217b768a19f7129546b" + integrity sha512-MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.10.0" - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/typescript-estree" "4.10.0" + "@typescript-eslint/scope-manager" "4.12.0" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/typescript-estree" "4.12.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.10.0.tgz#1a622b0847b765b2d8f0ede6f0cdd85f03d76031" - integrity sha512-amBvUUGBMadzCW6c/qaZmfr3t9PyevcSWw7hY2FuevdZVp5QPw/K76VSQ5Sw3BxlgYCHZcK6DjIhSZK0PQNsQg== +"@typescript-eslint/parser@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.12.0.tgz#e1cf30436e4f916c31fcc962158917bd9e9d460a" + integrity sha512-9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ== dependencies: - "@typescript-eslint/scope-manager" "4.10.0" - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/typescript-estree" "4.10.0" + "@typescript-eslint/scope-manager" "4.12.0" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/typescript-estree" "4.12.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.10.0.tgz#dbd7e1fc63d7363e3aaff742a6f2b8afdbac9d27" - integrity sha512-WAPVw35P+fcnOa8DEic0tQUhoJJsgt+g6DEcz257G7vHFMwmag58EfowdVbiNcdfcV27EFR0tUBVXkDoIvfisQ== +"@typescript-eslint/scope-manager@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz#beeb8beca895a07b10c593185a5612f1085ef279" + integrity sha512-QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg== dependencies: - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/visitor-keys" "4.10.0" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/visitor-keys" "4.12.0" -"@typescript-eslint/types@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789" - integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g== +"@typescript-eslint/types@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5" + integrity sha512-N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g== -"@typescript-eslint/typescript-estree@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75" - integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g== +"@typescript-eslint/typescript-estree@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz#3963418c850f564bdab3882ae23795d115d6d32e" + integrity sha512-gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w== dependencies: - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/visitor-keys" "4.10.0" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/visitor-keys" "4.12.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" @@ -1103,12 +1109,12 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451" - integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg== +"@typescript-eslint/visitor-keys@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz#a470a79be6958075fa91c725371a83baf428a67a" + integrity sha512-hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw== dependencies: - "@typescript-eslint/types" "4.10.0" + "@typescript-eslint/types" "4.12.0" eslint-visitor-keys "^2.0.0" JSONStream@^1.0.4: @@ -1160,7 +1166,7 @@ add-stream@^1.0.0: resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo= -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: +ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -1170,6 +1176,16 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2" + integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -1182,17 +1198,12 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.11.0" -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -1291,10 +1302,10 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async@^3.1.0: version "3.2.0" @@ -1519,9 +1530,9 @@ buffer@^5.5.0, buffer@^5.6.0: ieee754 "^1.1.13" bufferutil@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz#79f68631910f6b993d870fc77dc0a2894eb96cd5" - integrity sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA== + version "4.0.3" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b" + integrity sha512-yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw== dependencies: node-gyp-build "^4.2.0" @@ -1830,7 +1841,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -conventional-changelog-angular@^5.0.11: +conventional-changelog-angular@^5.0.12: version "5.0.12" resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9" integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw== @@ -1838,14 +1849,14 @@ conventional-changelog-angular@^5.0.11: compare-func "^2.0.0" q "^1.5.1" -conventional-changelog-atom@^2.0.7: +conventional-changelog-atom@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz#a759ec61c22d1c1196925fca88fe3ae89fd7d8de" integrity sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw== dependencies: q "^1.5.1" -conventional-changelog-codemirror@^2.0.7: +conventional-changelog-codemirror@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz#398e9530f08ce34ec4640af98eeaf3022eb1f7dc" integrity sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw== @@ -1857,16 +1868,7 @@ conventional-changelog-config-spec@2.1.0: resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz#874a635287ef8b581fd8558532bf655d4fb59f2d" integrity sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ== -conventional-changelog-conventionalcommits@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.4.0.tgz#8d96687141c9bbd725a89b95c04966d364194cd4" - integrity sha512-ybvx76jTh08tpaYrYn/yd0uJNLt5yMrb1BphDe4WBredMlvPisvMghfpnJb6RmRNcqXeuhR6LfGZGewbkRm9yA== - dependencies: - compare-func "^2.0.0" - lodash "^4.17.15" - q "^1.5.1" - -conventional-changelog-conventionalcommits@^4.4.0: +conventional-changelog-conventionalcommits@4.5.0, conventional-changelog-conventionalcommits@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.5.0.tgz#a02e0b06d11d342fdc0f00c91d78265ed0bc0a62" integrity sha512-buge9xDvjjOxJlyxUnar/+6i/aVEVGA7EEh4OafBCXPlLUQPGbRUBhBUveWRxzvR8TEjhKEP4BdepnpG2FSZXw== @@ -1875,17 +1877,17 @@ conventional-changelog-conventionalcommits@^4.4.0: lodash "^4.17.15" q "^1.5.1" -conventional-changelog-core@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.1.tgz#f811ad98ab2ff080becafc61407509420c9b447d" - integrity sha512-8cH8/DEoD3e5Q6aeogdR5oaaKs0+mG6+f+Om0ZYt3PNv7Zo0sQhu4bMDRsqAF+UTekTAtP1W/C41jH/fkm8Jtw== +conventional-changelog-core@^4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.2.tgz#f0897df6d53b5d63dec36b9442bd45354f8b3ce5" + integrity sha512-7pDpRUiobQDNkwHyJG7k9f6maPo9tfPzkSWbRq97GGiZqisElhnvUZSvyQH20ogfOjntB5aadvv6NNcKL1sReg== dependencies: add-stream "^1.0.0" conventional-changelog-writer "^4.0.18" conventional-commits-parser "^3.2.0" dateformat "^3.0.0" get-pkg-repo "^1.0.0" - git-raw-commits "2.0.0" + git-raw-commits "^2.0.8" git-remote-origin-url "^2.0.0" git-semver-tags "^4.1.1" lodash "^4.17.15" @@ -1896,35 +1898,35 @@ conventional-changelog-core@^4.2.0: shelljs "^0.8.3" through2 "^4.0.0" -conventional-changelog-ember@^2.0.8: +conventional-changelog-ember@^2.0.9: version "2.0.9" resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz#619b37ec708be9e74a220f4dcf79212ae1c92962" integrity sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A== dependencies: q "^1.5.1" -conventional-changelog-eslint@^3.0.8: +conventional-changelog-eslint@^3.0.9: version "3.0.9" resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz#689bd0a470e02f7baafe21a495880deea18b7cdb" integrity sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA== dependencies: q "^1.5.1" -conventional-changelog-express@^2.0.5: +conventional-changelog-express@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz#420c9d92a347b72a91544750bffa9387665a6ee8" integrity sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ== dependencies: q "^1.5.1" -conventional-changelog-jquery@^3.0.10: +conventional-changelog-jquery@^3.0.11: version "3.0.11" resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz#d142207400f51c9e5bb588596598e24bba8994bf" integrity sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw== dependencies: q "^1.5.1" -conventional-changelog-jshint@^2.0.8: +conventional-changelog-jshint@^2.0.9: version "2.0.9" resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz#f2d7f23e6acd4927a238555d92c09b50fe3852ff" integrity sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA== @@ -1938,9 +1940,9 @@ conventional-changelog-preset-loader@^2.3.4: integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g== conventional-changelog-writer@^4.0.18: - version "4.0.18" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz#10b73baa59c7befc69b360562f8b9cd19e63daf8" - integrity sha512-mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A== + version "4.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz#1ca7880b75aa28695ad33312a1f2366f4b12659f" + integrity sha512-WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw== dependencies: compare-func "^2.0.0" conventional-commits-filter "^2.0.7" @@ -1953,24 +1955,24 @@ conventional-changelog-writer@^4.0.18: split "^1.0.0" through2 "^4.0.0" -conventional-changelog@3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.23.tgz#d696408021b579a3814aba79b38729ed86478aea" - integrity sha512-sScUu2NHusjRC1dPc5p8/b3kT78OYr95/Bx7Vl8CPB8tF2mG1xei5iylDTRjONV5hTlzt+Cn/tBWrKdd299b7A== - dependencies: - conventional-changelog-angular "^5.0.11" - conventional-changelog-atom "^2.0.7" - conventional-changelog-codemirror "^2.0.7" - conventional-changelog-conventionalcommits "^4.4.0" - conventional-changelog-core "^4.2.0" - conventional-changelog-ember "^2.0.8" - conventional-changelog-eslint "^3.0.8" - conventional-changelog-express "^2.0.5" - conventional-changelog-jquery "^3.0.10" - conventional-changelog-jshint "^2.0.8" +conventional-changelog@3.1.24: + version "3.1.24" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.24.tgz#ebd180b0fd1b2e1f0095c4b04fd088698348a464" + integrity sha512-ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg== + dependencies: + conventional-changelog-angular "^5.0.12" + conventional-changelog-atom "^2.0.8" + conventional-changelog-codemirror "^2.0.8" + conventional-changelog-conventionalcommits "^4.5.0" + conventional-changelog-core "^4.2.1" + conventional-changelog-ember "^2.0.9" + conventional-changelog-eslint "^3.0.9" + conventional-changelog-express "^2.0.6" + conventional-changelog-jquery "^3.0.11" + conventional-changelog-jshint "^2.0.9" conventional-changelog-preset-loader "^2.3.4" -conventional-commits-filter@^2.0.6, conventional-commits-filter@^2.0.7: +conventional-commits-filter@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3" integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA== @@ -1978,7 +1980,7 @@ conventional-commits-filter@^2.0.6, conventional-commits-filter@^2.0.7: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-parser@^3.1.0, conventional-commits-parser@^3.2.0: +conventional-commits-parser@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz#9e261b139ca4b7b29bcebbc54460da36894004ca" integrity sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ== @@ -1991,18 +1993,18 @@ conventional-commits-parser@^3.1.0, conventional-commits-parser@^3.2.0: through2 "^4.0.0" trim-off-newlines "^1.0.0" -conventional-recommended-bump@6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.0.10.tgz#ac2fb3e31bad2aeda80086b345bf0c52edd1d1b3" - integrity sha512-2ibrqAFMN3ZA369JgVoSbajdD/BHN6zjY7DZFKTHzyzuQejDUCjQ85S5KHxCRxNwsbDJhTPD5hOKcis/jQhRgg== +conventional-recommended-bump@6.0.11: + version "6.0.11" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.0.11.tgz#fcc39acb51d1946b63fc478737d1e52712f36356" + integrity sha512-FciYBMwzwwBZ1K4NS8c57rsOfSc51e1V6UVSNIosrjH+A6xXkyiA4ELwoWyRKdMhJ+m3O6ru9ZJ7F2QFjjYJdQ== dependencies: concat-stream "^2.0.0" conventional-changelog-preset-loader "^2.3.4" - conventional-commits-filter "^2.0.6" - conventional-commits-parser "^3.1.0" + conventional-commits-filter "^2.0.7" + conventional-commits-parser "^3.2.0" git-raw-commits "2.0.0" - git-semver-tags "^4.1.0" - meow "^7.0.0" + git-semver-tags "^4.1.1" + meow "^8.0.0" q "^1.5.1" convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: @@ -2107,6 +2109,11 @@ dargs@^4.0.1: dependencies: number-is-nan "^1.0.0" +dargs@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" + integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2309,11 +2316,6 @@ emittery@^0.7.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -2403,15 +2405,15 @@ escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz#c1ae4106f74e6c0357f44adb076771d032ac0e97" - integrity sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ== +eslint-config-prettier@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f" + integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA== -eslint-plugin-prettier@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz#61e295349a65688ffac0b7808ef0a8244bdd8d40" - integrity sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ== +eslint-plugin-prettier@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" + integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== dependencies: prettier-linter-helpers "^1.0.0" @@ -2445,10 +2447,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.15.0: - version "7.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7" - integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA== +eslint@^7.17.0: + version "7.17.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0" + integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.2.2" @@ -2484,7 +2486,7 @@ eslint@^7.15.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^5.2.3" + table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -2750,9 +2752,9 @@ fast-safe-stringify@^2.0.4: integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== fastq@^1.6.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947" - integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w== + version "1.10.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" + integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== dependencies: reusify "^1.0.4" @@ -2768,11 +2770,6 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41" integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg== -fflate@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.2.tgz#90be9712dae6e874ce9d61f9678355da15ec7011" - integrity sha512-othuEXeiFBIaYC8crEkvcYjLw4tAFD4WypT7iyivcT6NxAN1Ib+w/pmeM1SyvwxlsbWPAvoUiMmfClaxq/yVow== - figures@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -2847,6 +2844,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -3010,6 +3015,17 @@ git-raw-commits@2.0.0: split2 "^2.0.0" through2 "^2.0.0" +git-raw-commits@^2.0.8: + version "2.0.9" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.9.tgz#5cbc707a615cb77b71e687f8a1ee54af46208b22" + integrity sha512-hSpNpxprVno7IOd4PZ93RQ+gNdzPAIrW0x8av6JQDJGV4k1mR9fE01dl8sEqi2P7aKmmwiGUn1BCPuf16Ae0Qw== + dependencies: + dargs "^7.0.0" + lodash.template "^4.0.2" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" + git-remote-origin-url@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f" @@ -3018,7 +3034,7 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^4.0.0, git-semver-tags@^4.1.0, git-semver-tags@^4.1.1: +git-semver-tags@^4.0.0, git-semver-tags@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780" integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA== @@ -3291,9 +3307,9 @@ ignore@^5.1.4: integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" - integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -3473,11 +3489,6 @@ is-finite@^1.0.0: resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -4084,6 +4095,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -4225,6 +4241,13 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -4270,7 +4293,7 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: +lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -4407,27 +4430,10 @@ meow@^4.0.0: redent "^2.0.0" trim-newlines "^2.0.0" -meow@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/meow/-/meow-7.1.1.tgz#7c01595e3d337fcb0ec4e8eed1666ea95903d306" - integrity sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^2.5.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.13.1" - yargs-parser "^18.1.3" - meow@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-8.0.0.tgz#1aa10ee61046719e334ffdc038bb5069250ec99a" - integrity sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg== + version "8.1.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.0.tgz#0fcaa267e35e4d58584b8205923df6021ddcc7ba" + integrity sha512-fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA== dependencies: "@types/minimist" "^1.2.0" camelcase-keys "^6.2.2" @@ -4488,17 +4494,17 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.0.5" -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== +mime-db@1.45.0: + version "1.45.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" + integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + version "2.1.28" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" + integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== dependencies: - mime-db "1.44.0" + mime-db "1.45.0" mime@1.6.0: version "1.6.0" @@ -4572,6 +4578,14 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== +moonbeam-types-bundle@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/moonbeam-types-bundle/-/moonbeam-types-bundle-1.0.5.tgz#7620f003af92e121bc96a6dad1ed7c22540b5933" + integrity sha512-DpNsjtdWUtWKecI2Oo/ovuGbWzyGOCBLyeXi5UYvYslHQ1iJchNtYG2QINF9iuQucC8ZFLoSg6bbteKOnfLnWg== + dependencies: + "@polkadot/api" "^3.2.3" + typescript "^4.1.3" + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -4879,6 +4893,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -4900,6 +4921,13 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -5115,10 +5143,10 @@ pretty-format@^26.0.0, pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" -prismjs@>=1.21.1: - version "1.22.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz#73c3400afc58a823dd7eed023f8e1ce9fd8977fa" - integrity sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w== +prismjs@>=1.23.0: + version "1.23.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" + integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA== optionalDependencies: clipboard "^2.0.0" @@ -5271,7 +5299,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@3, readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -5411,6 +5439,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -5681,14 +5714,14 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" snapdragon-node@^2.0.1: version "2.1.1" @@ -5799,6 +5832,13 @@ split2@^2.0.0: dependencies: through2 "^2.0.2" +split2@^3.0.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== + dependencies: + readable-stream "^3.0.0" + split@0.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -5845,21 +5885,21 @@ stack-utils@^2.0.2: dependencies: escape-string-regexp "^2.0.0" -standard-version@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.0.0.tgz#814055add91eec8679a773768927f927183fc818" - integrity sha512-eRR04IscMP3xW9MJTykwz13HFNYs8jS33AGuDiBKgfo5YrO0qX0Nxb4rjupVwT5HDYL/aR+MBEVLjlmVFmFEDQ== +standard-version@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.1.0.tgz#07589469324d967ffe665fa86ef612949a858a80" + integrity sha512-EJcbKUGKBuHjiDSUL5XjPhT1KGVM+UCvv/ti70fHnJwJyJqTSJWl0mWj/Wj0WwsoskyvKWURESzBsZmCCMUZzg== dependencies: chalk "^2.4.2" - conventional-changelog "3.1.23" + conventional-changelog "3.1.24" conventional-changelog-config-spec "2.1.0" - conventional-changelog-conventionalcommits "4.4.0" - conventional-recommended-bump "6.0.10" + conventional-changelog-conventionalcommits "4.5.0" + conventional-recommended-bump "6.0.11" detect-indent "^6.0.0" detect-newline "^3.1.0" dotgitignore "^2.1.0" figures "^3.1.0" - find-up "^4.1.0" + find-up "^5.0.0" fs-access "^1.0.1" git-semver-tags "^4.0.0" semver "^7.1.1" @@ -5904,15 +5944,6 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^4.1.0, string-width@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" @@ -5941,13 +5972,6 @@ stringify-package@^1.0.1: resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -6033,15 +6057,15 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== +table@^6.0.4: + version "6.0.7" + resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" + integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + ajv "^7.0.2" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" terminal-link@^2.0.0: version "2.1.1" @@ -6235,9 +6259,9 @@ tslib@^1.8.1, tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tsutils@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" - integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + version "3.18.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.18.0.tgz#38add50a28ec97e988cb43c5b32e55d1ff4a222a" + integrity sha512-D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA== dependencies: tslib "^1.8.1" @@ -6282,11 +6306,6 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - type-fest@^0.18.0: version "0.18.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" @@ -6343,9 +6362,9 @@ typescript@^4.1.3: integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== uglify-js@^3.1.4: - version "3.12.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz#c7ae89da0ed1bb58999c7fce07190b347fdbdaba" - integrity sha512-rWYleAvfJPjduYCt+ELvzybNah/zIkRteGXIBO8X0lteRZPGladF61hFi8tU7qKTsF7u6DUQCtT9k00VlFOgkg== + version "3.12.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.4.tgz#93de48bb76bb3ec0fc36563f871ba46e2ee5c7ee" + integrity sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A== union-value@^1.0.0: version "1.0.1" @@ -6388,9 +6407,9 @@ use@^3.1.0: integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== utf-8-validate@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz#3b64e418ad2ff829809025fdfef595eab2f03a27" - integrity sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A== + version "5.0.4" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz#72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8" + integrity sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q== dependencies: node-gyp-build "^4.2.0" @@ -6420,9 +6439,9 @@ v8-compile-cache@^2.0.3: integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== v8-to-istanbul@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc" - integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA== + version "7.1.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" + integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -6596,9 +6615,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.2.3: - version "7.4.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" - integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== + version "7.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" + integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== xml-name-validator@^3.0.0: version "3.0.0" @@ -6647,7 +6666,7 @@ yargs-parser@20.x, yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs-parser@^18.1.2, yargs-parser@^18.1.3: +yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== @@ -6671,3 +6690,8 @@ yargs@^15.3.1, yargs@^15.4.1: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^18.1.2" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==