From 719aeef7288fdbf4934a565b1d98b490e21d8b13 Mon Sep 17 00:00:00 2001 From: Marc Font Date: Mon, 22 May 2023 18:41:03 +0200 Subject: [PATCH 1/6] integrate toolkit v1 --- package.json | 1 + src/tasks/generatePublishTx.ts | 66 +- src/utils/Apm.ts | 179 +++ src/utils/versions/getNextVersionFromApm.ts | 21 + test/utils/Apm.test.ts | 42 + yarn.lock | 1170 ++++++++++++++----- 6 files changed, 1192 insertions(+), 287 deletions(-) create mode 100644 src/utils/Apm.ts create mode 100644 test/utils/Apm.test.ts diff --git a/package.json b/package.json index dbb0c9e4..d2eb392b 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ }, "homepage": "https://github.com/dappnode/DAppNodeSDK#readme", "dependencies": { + "@dappnode/toolkit": "0.1.12", "@dappnode/schemas": "^0.1.6", "@dappnode/toolkit": "^0.1.18", "@dappnode/types": "^0.1.12", diff --git a/src/tasks/generatePublishTx.ts b/src/tasks/generatePublishTx.ts index f7e9d7ec..09e20f8b 100644 --- a/src/tasks/generatePublishTx.ts +++ b/src/tasks/generatePublishTx.ts @@ -1,10 +1,17 @@ import Listr from "listr"; import { ethers } from "ethers"; import { +<<<<<<< HEAD getEthereumUrl } from "../utils/getEthereumUrl.js"; +======= + //Apm, + encodeNewVersionCall, + encodeNewRepoWithVersionCall +} from "../utils/Apm.js"; +>>>>>>> integrate toolkit v1 import { getPublishTxLink } from "../utils/getLinks.js"; import { addReleaseTx } from "../utils/releaseRecord.js"; import { defaultDir, YargsError } from "../params.js"; @@ -15,6 +22,9 @@ import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" import { semverToArray } from "../utils/semverToArray.js"; import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; +import { ApmRepository } from "@dappnode/toolkit"; +import { getEthereumProviderUrl } from "../utils/Apm.js"; + const isZeroAddress = (address: string): boolean => parseInt(address) === 0; /** @@ -41,8 +51,16 @@ export function generatePublishTx({ ethProvider: string; } & CliGlobalOptions): Listr { // Init APM instance +<<<<<<< HEAD const ethereumUrl = getEthereumUrl(ethProvider); const apm = new ApmRepository(ethereumUrl); +======= + //const apm = new Apm(ethProvider); + + const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) + // Init APM instance + const apm2 = new ApmRepository(parsedProvider); +>>>>>>> integrate toolkit v1 // Load manifest ##### Verify manifest object const { manifest } = readManifest({ dir }); @@ -60,10 +78,15 @@ export function generatePublishTx({ { title: "Generate transaction", task: async ctx => { +<<<<<<< HEAD try { const repository = await apm.getRepoContract(ensName); +======= + const repository = await parsedProvider.resolveName(ensName); + if (repository) { +>>>>>>> integrate toolkit v1 ctx.txData = { - to: await repository.getAddress(), + to: repository, value: 0, data: encodeNewVersionCall({ version: currentVersion, @@ -75,6 +98,7 @@ export function generatePublishTx({ currentVersion, releaseMultiHash }; +<<<<<<< HEAD } catch (e) { if (e.message.includes("Could not resolve name")) { try { @@ -93,6 +117,25 @@ export function generatePublishTx({ ) { throw new YargsError( `A new Aragon Package Manager Repo for ${ensName} must be created. +======= + } else { + //const registry = await apm.getRegistryContract(ensName); + const registry = await parsedProvider.resolveName(ensName.split(".").slice(1).join(".")); + if (!registry) + throw Error( + `There must exist a registry for DNP name ${ensName}` + ); + + // If repo does not exist, create a new repo and push version + // A developer address must be provided by the option -a or --developer_address. + if ( + !developerAddress || + !ethers.isAddress(developerAddress) || + isZeroAddress(developerAddress) + ) { + throw new YargsError( + `A new Aragon Package Manager Repo for ${ensName} must be created. +>>>>>>> integrate toolkit v1 You must specify the developer address that will control it with ENV: @@ -103,6 +146,7 @@ with command option: dappnodesdk publish [type] --developer_address 0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B ` +<<<<<<< HEAD ); } @@ -128,6 +172,26 @@ with command option: ); } } else throw e; +======= + ); + } + ctx.txData = { + to: registry, + value: 0, + data: encodeNewRepoWithVersionCall({ + name: shortName, + developerAddress, + version: currentVersion, + contractAddress, + contentURI + }), + gasLimit: 1100000, + ensName, + currentVersion, + releaseMultiHash, + developerAddress + }; +>>>>>>> integrate toolkit v1 } /** diff --git a/src/utils/Apm.ts b/src/utils/Apm.ts new file mode 100644 index 00000000..6630b82e --- /dev/null +++ b/src/utils/Apm.ts @@ -0,0 +1,179 @@ +import { ethers } from "ethers"; +import { arrayToSemver } from "../utils/arrayToSemver.js"; +import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; +import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" }; +import { semverToArray } from "./semverToArray.js"; + +export function getEthereumProviderUrl(provider = "dappnode"): string { + if (provider === "dappnode") { + return "http://fullnode.dappnode:8545"; + } else if (provider === "remote") { + return "https://web3.dappnode.net"; + } else if (provider === "infura") { + // Make sure to change this common Infura token + // if it stops working or you prefer to use your own + return "https://mainnet.infura.io/v3/bb15bacfcdbe45819caede241dcf8b0d"; + } else { + return provider; + } +} + +//TODO: refactor this file so it is a utils file and not a class + +/** + * @param provider user selected provider. Possible values: + * - null + * - "dappnode" + * - "infura" + * - "http://localhost:8545" + * - "ws://localhost:8546" + * @return apm instance + */ +export class Apm { + provider: ethers.JsonRpcProvider; + + constructor(providerId: string) { + // Initialize ens and web3 instances + // Use http Ids to avoid opened websocket connection + // This application does not need subscriptions and performs very few requests per use + const providerUrl = getEthereumProviderUrl(providerId); + + this.provider = new ethers.JsonRpcProvider(providerUrl); + } + + // Ens throws if a node is not found + // + // ens.resolver('admin.dnp.dappnode.eth').addr() + // ==> 0xee66c4765696c922078e8670aa9e6d4f6ffcc455 + // ens.resolver('fake.dnp.dappnode.eth').addr() + // ==> Unhandled rejection Error: ENS name not found + // + // Change behaviour to return null if not found + async resolve(ensDomain: string): Promise { + try { + return await this.provider.resolveName(ensDomain); + } catch (e) { + // This error is particular for ethjs + if (e.message.includes("ENS name not defined")) return null; + else throw e; + } + } + + /** + * Get the lastest version of an APM repo contract for an ENS domain. + * + * @param ensName: "admin.dnp.dappnode.eth" + * @return latest semver version = '0.1.0' + */ + async getLatestVersion(ensName: string): Promise { + if (!ensName) + throw Error("getLatestVersion first argument ensName must be defined"); + + const repository = await this.getRepoContract(ensName); + if (!repository) { + const registry = await this.getRegistryContract(ensName); + if (registry) + throw Error( + `Error NOREPO: you must first deploy the repo of ${ensName} using the command publish` + ); + else + throw Error( + `Error: there must exist a registry for DNP name ${ensName}` + ); + } + + try { + const res = await repository.getLatest(); + return arrayToSemver(res.semanticVersion); + } catch (e) { + // Rename error for user comprehension + e.message = `Error getting latest version of ${ensName}: ${e.message}`; + throw e; + } + } + + /** + * Get the APM repo contract for an ENS domain. + * ENS domain: admin.dnp.dappnode.eth + * + * @param ensName: "admin.dnp.dappnode.eth" + * @return contract instance of the Repo "admin.dnp.dappnode.eth" + */ + async getRepoContract(ensName: string): Promise { + const repoAddress = await this.resolve(ensName); + if (!repoAddress) return null; + return new ethers.Contract(repoAddress, repoAbi, this.provider); + } + + /** + * Get the APM registry contract for an ENS domain. + * It will slice the first subdomain and query the rest as: + * ENS domain: admin.dnp.dappnode.eth + * Registry domain: dnp.dappnode.eth + * + * @param ensName: "admin.dnp.dappnode.eth" + * @return contract instance of the Registry "dnp.dappnode.eth" + */ + async getRegistryContract(ensName: string): Promise { + const repoId = ensName.split(".").slice(1).join("."); + const registryAddress = await this.resolve(repoId); + if (!registryAddress) return null; + return new ethers.Contract(registryAddress, registryAbi, this.provider); + } +} + +/** + * newVersion( + * uint16[3] _newSemanticVersion, + * address _contractAddress, + * bytes _contentURI + * ) + */ +export function encodeNewVersionCall({ + version, + contractAddress, + contentURI +}: { + version: string; + contractAddress: string; + contentURI: string; +}): string { + const repo = ethers.Interface.from(repoAbi) + return repo.encodeFunctionData("newVersion", [ + semverToArray(version), // uint16[3] _newSemanticVersion + contractAddress, // address _contractAddress + contentURI // bytes _contentURI + ]); +} + +/** + * newRepoWithVersion( + * string _name, + * address _dev, + * uint16[3] _initialSemanticVersion, + * address _contractAddress, + * bytes _contentURI + * ) + */ +export function encodeNewRepoWithVersionCall({ + name, + developerAddress, + version, + contractAddress, + contentURI +}: { + name: string; + developerAddress: string; + version: string; + contractAddress: string; + contentURI: string; +}): string { + const registry = ethers.Interface.from(registryAbi) + return registry.encodeFunctionData("newRepoWithVersion", [ + name, // string _name + developerAddress, // address _dev + semverToArray(version), // uint16[3] _initialSemanticVersion + contractAddress, // address _contractAddress + contentURI // bytes _contentURI + ]); +} diff --git a/src/utils/versions/getNextVersionFromApm.ts b/src/utils/versions/getNextVersionFromApm.ts index 060d4d04..d8cd18b8 100644 --- a/src/utils/versions/getNextVersionFromApm.ts +++ b/src/utils/versions/getNextVersionFromApm.ts @@ -1,10 +1,18 @@ import semver from "semver"; +<<<<<<< HEAD import { getEthereumUrl } from "../getEthereumUrl.js"; +======= +>>>>>>> integrate toolkit v1 import { checkSemverType } from "../checkSemverType.js"; import { ReleaseType } from "../../types.js"; import { readManifest } from "../../files/index.js"; import { ApmRepository } from "@dappnode/toolkit"; +<<<<<<< HEAD +======= +import { ethers } from "ethers"; +import { getEthereumProviderUrl } from "../Apm.js"; +>>>>>>> integrate toolkit v1 export async function getNextVersionFromApm({ type, ethProvider, @@ -17,19 +25,32 @@ export async function getNextVersionFromApm({ // Check variables checkSemverType(type); + // ethProvider is a simple "dappnode" or "infura" string + // we need to convert it to a valid url + const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) + // Init APM instance +<<<<<<< HEAD const apm = new ApmRepository(getEthereumUrl(ethProvider)); +======= + const apm = new ApmRepository(parsedProvider); +>>>>>>> integrate toolkit v1 // Load manifest const { manifest } = readManifest({ dir }); const ensName = manifest.name.toLowerCase(); // Fetch the latest version from APM +<<<<<<< HEAD console.log("ensName: ", ensName); const { version: currentVersion } = await apm.getVersionAndIpfsHash({ dnpName: ensName }); +======= + const currentVersion = (await apm.getVersionAndIpfsHash({ dnpName: ensName })).version; + console.log(`Current version2: ${currentVersion}`) +>>>>>>> integrate toolkit v1 // Increase the version and log it const nextVersion = semver.inc(currentVersion, type); if (!nextVersion) diff --git a/test/utils/Apm.test.ts b/test/utils/Apm.test.ts new file mode 100644 index 00000000..4f57d2b9 --- /dev/null +++ b/test/utils/Apm.test.ts @@ -0,0 +1,42 @@ +import semver from "semver"; +import { expect } from "chai"; +import { getEthereumProviderUrl } from "../../src/utils/Apm.js"; +import { ethers } from "ethers"; +describe("Apm constructor", function () { + this.timeout(60_000); + + const dnpName = "admin.dnp.dappnode.eth"; + + it("Should get the contract the registry contract of a DNP name", async () => { + const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl("infura")) + const registry = await parsedProvider.resolveName(dnpName.split(".").slice(1).join(".")) + + if (!registry) throw Error("no registry"); + expect(await registry).to.be.a("string", "Contract instance changed"); + expect((await registry).toLowerCase()).to.equal( + "0x266BFdb2124A68beB6769dC887BD655f78778923".toLowerCase() + ); + }); + + it("Should get the contract the repo contract of a DNP name", async () => { + const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl("infura")) + const repo = await parsedProvider.resolveName(dnpName) + + if (!repo) throw Error("no repo"); + expect(await repo).to.be.a("string", "Contract instance changed"); + expect((await repo).toLowerCase()).to.equal( + "0xEe66C4765696C922078e8670aA9E6d4F6fFcc455".toLowerCase() + ); + }); + + // it("Should get the latest of a DNP name", async () => { + // const apm = new Apm("infura"); + // const latestVersion = await apm.getLatestVersion(dnpName); + + // expect(latestVersion).to.be.a("string", "Contract instance changed"); + // expect(Boolean(semver.valid(latestVersion))).to.equal( + // true, + // `Resulting version is not a valid semver: ${semver}` + // ); + // }); +}); diff --git a/yarn.lock b/yarn.lock index deb3aa99..db031862 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,7 +4,11 @@ "@adraffy/ens-normalize@1.9.0": version "1.9.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.0.tgz#223572538f6bea336750039bb43a4016dcc8182d" +======= + resolved "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ== "@babel/code-frame@^7.0.0": @@ -35,12 +39,20 @@ "@chainsafe/is-ip@^2.0.1": version "2.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@chainsafe/is-ip/-/is-ip-2.0.1.tgz#62cb285669d91f88fd9fa285048dde3882f0993b" +======= + resolved "https://registry.npmjs.org/@chainsafe/is-ip/-/is-ip-2.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-nqSJ8u2a1Rv9FYbyI8qpDhTYujaKEyLknNrTejLYoSWmdeg+2WB7R6BZqPZYfrJzDxVi3rl6ZQuoaEvpKRZWgQ== "@chainsafe/netmask@^2.0.0": version "2.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@chainsafe/netmask/-/netmask-2.0.0.tgz#0d4a75f47919f65011da4327a3845c9661f1038a" +======= + resolved "https://registry.npmjs.org/@chainsafe/netmask/-/netmask-2.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-I3Z+6SWUoaljh3TBzCnCxjlUyN8tA+NAk5L6m9IxvCf1BENQTePzPMis97CoN/iMW1St3WN+AWCCRp+TTBRiDg== dependencies: "@chainsafe/is-ip" "^2.0.1" @@ -53,15 +65,16 @@ "@jridgewell/trace-mapping" "0.3.9" "@dappnode/schemas@^0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@dappnode/schemas/-/schemas-0.1.6.tgz#d299cc6b7a4aec663688dcbb3ea7ebc1f4963aef" - integrity sha512-deKlp0PBEszpYmZFSevMFs/RqJnxuTxkxWAVTNKs2vvHbcCP50kWw/agl0pHCIJPqg8S83rq5H88lpL3vtP5Rw== + version "0.1.7" + resolved "https://registry.npmjs.org/@dappnode/schemas/-/schemas-0.1.7.tgz" + integrity sha512-jd72x7Qf4IuWdgaeqlajgGaZ7vSAmMZrEg9mwe5NcEgrBfgIE4sWA8ewnIswV+1BCtWsewkEpvAA4WdKIfNyjQ== dependencies: "@dappnode/types" "^0.1.9" ajv "^8.12.0" ajv-errors "^3.0.0" semver "^7.5.0" +<<<<<<< HEAD "@dappnode/toolkit@^0.1.18": version "0.1.18" resolved "https://registry.yarnpkg.com/@dappnode/toolkit/-/toolkit-0.1.18.tgz#8918b8be9c16aff88c613b4a606fa34f702c3ad6" @@ -80,10 +93,31 @@ yaml "^2.2.2" "@dappnode/types@^0.1.12": +======= +"@dappnode/toolkit@0.1.12": +>>>>>>> integrate toolkit v1 version "0.1.12" - resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.12.tgz#b7d804d7bd511af2f189ca36f9e3f04952d310ee" + resolved "https://registry.npmjs.org/@dappnode/toolkit/-/toolkit-0.1.12.tgz" + integrity sha512-+cGpyCaOFeT9Vpd66BO+MGJy9oniENZG+spn3IclwFDyXQON4TY/RyjgbXrZ7dOBFGIs251X2KKysIv5EVjj/g== + dependencies: + "@dappnode/types" "^0.1.12" + "@ipld/car" "^5.1.1" + esm "^3.2.25" + ethers "^6.3.0" + graphql-request "^6.0.0" + ipfs-http-client "^60.0.0" + ipfs-unixfs-exporter "^13.1.5" + is-ipfs "^8.0.1" + multiformats "^11.0.2" + semver "^7.5.0" + yaml "^2.2.2" + +"@dappnode/types@^0.1.12", "@dappnode/types@^0.1.9": + version "0.1.12" + resolved "https://registry.npmjs.org/@dappnode/types/-/types-0.1.12.tgz" integrity sha512-k35wyNqZ5Cm2aY+W+2QPzHR9vq00dv2gVENhmhU4yUOjSnK69tihilnTD4fmWOCs9hPEXsJOh3GDzUCUUbrzwg== +<<<<<<< HEAD "@dappnode/types@^0.1.9": version "0.1.9" resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.9.tgz#23d13181ab077b33e23b929bd32cc6b2b618ec4a" @@ -92,11 +126,20 @@ "@graphql-typed-document-node/core@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" +======= +"@graphql-typed-document-node/core@^3.2.0": + version "3.2.0" + resolved "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== "@ipld/car@^5.1.1": version "5.1.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@ipld/car/-/car-5.1.1.tgz#14a26dc97c4783ade491ac811f61885259b9d75e" +======= + resolved "https://registry.npmjs.org/@ipld/car/-/car-5.1.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-HoFTUqUJL9cPGhC9qRmHCvamfIsj1JllQSQ/Xu9/KN/VNJp8To9Ms4qiZPEMOwcrNFclfYqrahjGYbf4KL/d9A== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -105,24 +148,40 @@ varint "^6.0.0" "@ipld/dag-cbor@^9.0.0": +<<<<<<< HEAD version "9.0.1" resolved "https://registry.yarnpkg.com/@ipld/dag-cbor/-/dag-cbor-9.0.1.tgz#fc7c76af284b74b3a67b003a768d2c4758841272" integrity sha512-tImDka4akO7cuD24+nRLOU1kYXoai3VZ1cMeWCFUzwhKrRXyOLfVd9RZGI6aTsE/PYvHmkFobKvTeK9NPVtajA== +======= + version "9.0.0" + resolved "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.0.tgz" + integrity sha512-zdsiSiYDEOIDW7mmWOYWC9gukjXO+F8wqxz/LfN7iSwTfIyipC8+UQrCbPupFMRb/33XQTZk8yl3My8vUQBRoA== +>>>>>>> integrate toolkit v1 dependencies: cborg "^1.10.0" multiformats "^11.0.0" "@ipld/dag-json@^10.0.0": +<<<<<<< HEAD version "10.1.0" resolved "https://registry.yarnpkg.com/@ipld/dag-json/-/dag-json-10.1.0.tgz#9cad1628d9ef6df0d732d2d468adb53987d1111d" integrity sha512-2rSvzDyGxx1NC24IsqKFTSXzAfUBlniZQRT15PEN+i177KEBsCXPfxuN/DweGIfmj3YceNyR8XOJT47pRZu7Cg== +======= + version "10.0.1" + resolved "https://registry.npmjs.org/@ipld/dag-json/-/dag-json-10.0.1.tgz" + integrity sha512-XE1Eqw3eNVrSfOhtqCM/gwCxEgYFBzkDlkwhEeMmMvhd0rLBfSyVzXbahZSlv97tiTPEIx5rt41gcFAda3W8zg== +>>>>>>> integrate toolkit v1 dependencies: cborg "^1.10.0" multiformats "^11.0.0" "@ipld/dag-pb@^4.0.0": version "4.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@ipld/dag-pb/-/dag-pb-4.0.3.tgz#2fedd3804ad46ea6206be9302bfed5d3a0af26b3" +======= + resolved "https://registry.npmjs.org/@ipld/dag-pb/-/dag-pb-4.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-bOe+Z2ZJs9pmP/aIUBYMTdXq0i5z1x71qXeOIIhZvnKFLuzTIbbW0u5b7OfTGzUEbSv1dkUZBIXa7G/+OA8dnA== dependencies: multiformats "^11.0.0" @@ -147,7 +206,11 @@ "@libp2p/interface-connection@^4.0.0": version "4.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-connection/-/interface-connection-4.0.0.tgz#fcc830ca891820fac89a4c6bd4fcc2df4874f49b" +======= + resolved "https://registry.npmjs.org/@libp2p/interface-connection/-/interface-connection-4.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-6xx/NmEc84HX7QmsjSC3hHredQYjHv4Dkf4G27adAPf+qN+vnPxmQ7gaTnk243a0++DOFTbZ2gKX/15G2B6SRg== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -158,7 +221,11 @@ "@libp2p/interface-keychain@^2.0.0": version "2.0.5" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-keychain/-/interface-keychain-2.0.5.tgz#6ce104f38cf07ad72c9dfbe471a689f4ea4b4687" +======= + resolved "https://registry.npmjs.org/@libp2p/interface-keychain/-/interface-keychain-2.0.5.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-mb7QNgn9fIvC7CaJCi06GJ+a6DN6RVT9TmEi0NmedZGATeCArPeWWG7r7IfxNVXb9cVOOE1RzV1swK0ZxEJF9Q== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -166,14 +233,22 @@ "@libp2p/interface-peer-id@^2.0.0": version "2.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-peer-id/-/interface-peer-id-2.0.2.tgz#6302e70b6fc17c451bc3daa11447d059357bcc32" +======= + resolved "https://registry.npmjs.org/@libp2p/interface-peer-id/-/interface-peer-id-2.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-9pZp9zhTDoVwzRmp0Wtxw0Yfa//Yc0GqBCJi3EznBDE6HGIAVvppR91wSh2knt/0eYg0AQj7Y35VSesUTzMCUg== dependencies: multiformats "^11.0.0" "@libp2p/interface-peer-info@^1.0.2": version "1.0.10" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-peer-info/-/interface-peer-info-1.0.10.tgz#566026de95a0817b9e853c982b313541b7960c0b" +======= + resolved "https://registry.npmjs.org/@libp2p/interface-peer-info/-/interface-peer-info-1.0.10.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-HQlo8NwQjMyamCHJrnILEZz+YwEOXCB2sIIw3slIrhVUYeYlTaia1R6d9umaAeLHa255Zmdm4qGH8rJLRqhCcg== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -181,7 +256,11 @@ "@libp2p/interface-pubsub@^3.0.0": version "3.0.7" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-pubsub/-/interface-pubsub-3.0.7.tgz#cc1c7c47c883daddd2b84d83d719b3826943be3b" +======= + resolved "https://registry.npmjs.org/@libp2p/interface-pubsub/-/interface-pubsub-3.0.7.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-+c74EVUBTfw2sx1GE/z/IjsYO6dhur+ukF0knAppeZsRQ1Kgg6K5R3eECtT28fC6dBWLjFpAvW/7QGfiDAL4RA== dependencies: "@libp2p/interface-connection" "^4.0.0" @@ -192,12 +271,20 @@ "@libp2p/interfaces@^3.0.0", "@libp2p/interfaces@^3.2.0", "@libp2p/interfaces@^3.3.1": version "3.3.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interfaces/-/interfaces-3.3.2.tgz#5d8079be845b0960939b5b18880e785a4714465a" +======= + resolved "https://registry.npmjs.org/@libp2p/interfaces/-/interfaces-3.3.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-p/M7plbrxLzuQchvNwww1Was7ZeGE2NaOFulMaZBYIihU8z3fhaV+a033OqnC/0NTX/yhfdNOG7znhYq3XoR/g== "@libp2p/logger@^2.0.0": version "2.0.7" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/logger/-/logger-2.0.7.tgz#9a3996242b4a9edb8a9d825c8accaf62f617c5c6" +======= + resolved "https://registry.npmjs.org/@libp2p/logger/-/logger-2.0.7.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Zp9C9lMNGfVFTMVc7NvxuxMvIE6gyxDapQc/TqZH02IuIDl1JpZyCgNILr0APd8wcUxwvwRXYNf3kQ0Lmz7tuQ== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -207,7 +294,11 @@ "@libp2p/peer-id@^2.0.0": version "2.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/peer-id/-/peer-id-2.0.3.tgz#7299d74eae7b2526123d941bdb2d08462704c79a" +======= + resolved "https://registry.npmjs.org/@libp2p/peer-id/-/peer-id-2.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-eZX+5ByUAzh8DrfjCan0spZGpvF7SxEBz4tOPoBMBCuKJJLr+8EokBO/5E3ceIw04f5+lAcD3CO3bccuKomp3Q== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -217,21 +308,35 @@ "@multiformats/mafmt@^11.0.3": version "11.1.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@multiformats/mafmt/-/mafmt-11.1.2.tgz#c03ef4022c795b7f230b136f2f974fc263eac4f1" +======= + resolved "https://registry.npmjs.org/@multiformats/mafmt/-/mafmt-11.1.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-3n1o5eLU7WzTAPLuz3AodV7Iql6NWf7Ws8fqVaGT7o5nDDabUPYGBm2cZuh3OrqmwyCY61LrNUIsjzivU6UdpQ== dependencies: "@multiformats/multiaddr" "^12.0.0" "@multiformats/multiaddr-to-uri@^9.0.1": +<<<<<<< HEAD version "9.0.7" resolved "https://registry.yarnpkg.com/@multiformats/multiaddr-to-uri/-/multiaddr-to-uri-9.0.7.tgz#44881352b1d9d98b53451982cd433f0f45ad7e24" integrity sha512-i3ldtPMN6XJt+MCi34hOl0wGuGEHfWWMw6lmNag5BpckPwPTf9XGOOFMmh7ed/uO3Vjah/g173iOe61HTQVoBA== +======= + version "9.0.4" + resolved "https://registry.npmjs.org/@multiformats/multiaddr-to-uri/-/multiaddr-to-uri-9.0.4.tgz" + integrity sha512-y2XDH/h6U1hnkFNyt3NeJhUv+9PiXJlzC6RZOOzK2OY3JgM6l6RrPrOJ1Tc2Sn4Aw6b2aUKY4C6nN4h6j9/+Vg== +>>>>>>> integrate toolkit v1 dependencies: "@multiformats/multiaddr" "^12.0.0" "@multiformats/multiaddr@^11.0.0": version "11.6.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-11.6.1.tgz#ec46984a298e715e27a398434c087856db5f3185" +======= + resolved "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-11.6.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-doST0+aB7/3dGK9+U5y3mtF3jq85KGbke1QiH0KE1F5mGQ9y56mFebTeu2D9FNOm+OT6UHb8Ss8vbSnpGjeLNw== dependencies: "@chainsafe/is-ip" "^2.0.1" @@ -243,7 +348,11 @@ "@multiformats/multiaddr@^12.0.0": version "12.1.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-12.1.3.tgz#aff5aa61ec19c5320f0b756e88c3bbaac8d1c7af" +======= + resolved "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-12.1.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-rNcS3njkkSwuGF4x58L47jGH5kBXBfJPNsWnrt0gujhNYn6ReDt1je7vEU5/ddrVj0TStgxw+Hm+TkYDK0b60w== dependencies: "@chainsafe/is-ip" "^2.0.1" @@ -255,21 +364,35 @@ varint "^6.0.0" "@multiformats/murmur3@^2.0.0": +<<<<<<< HEAD version "2.1.4" resolved "https://registry.yarnpkg.com/@multiformats/murmur3/-/murmur3-2.1.4.tgz#e93cce560c381f8326b2271facf2ea04f6fd8a66" integrity sha512-qHHmZKD1Dy6PDi35pAowE1pQtnH7gwaJpUE/Ju+cOYVdWD4T8VVtKAumGCxwd31JKyNC0W1IzAaHQz1dnXXvBw== +======= + version "2.1.3" + resolved "https://registry.npmjs.org/@multiformats/murmur3/-/murmur3-2.1.3.tgz" + integrity sha512-YvLK1IrLnRckPsvXhOkZjaIGNonsEdD1dL3NPSaLilV/WjVYeBgnNZXTUsaPzFXGrIFM7motx+yCmmqzXO6gtQ== +>>>>>>> integrate toolkit v1 dependencies: multiformats "^11.0.0" murmurhash3js-revisited "^3.0.0" "@noble/hashes@1.1.2": version "1.1.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" +======= + resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== "@noble/secp256k1@1.7.1": version "1.7.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c" +======= + resolved "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw== "@octokit/auth-token@^2.4.4": @@ -279,7 +402,7 @@ dependencies: "@octokit/types" "^6.0.0" -"@octokit/core@^3.2.3": +"@octokit/core@^3.2.3", "@octokit/core@>=2", "@octokit/core@>=3": version "3.2.4" resolved "https://registry.npmjs.org/@octokit/core/-/core-3.2.4.tgz" integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg== @@ -367,7 +490,14 @@ "@octokit/plugin-request-log" "^1.0.2" "@octokit/plugin-rest-endpoint-methods" "4.4.1" -"@octokit/types@^5.0.0", "@octokit/types@^5.0.1": +"@octokit/types@^5.0.0": + version "5.0.1" + resolved "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz" + integrity sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA== + dependencies: + "@types/node" ">= 8" + +"@octokit/types@^5.0.1": version "5.0.1" resolved "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz" integrity sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA== @@ -384,27 +514,47 @@ "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" +======= + resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== "@protobufjs/base64@^1.1.2": version "1.1.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" +======= + resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== "@protobufjs/codegen@^2.0.4": version "2.0.4" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" +======= + resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== "@protobufjs/eventemitter@^1.1.0": version "1.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" +======= + resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== "@protobufjs/fetch@^1.1.0": version "1.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" +======= + resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== dependencies: "@protobufjs/aspromise" "^1.1.1" @@ -412,27 +562,47 @@ "@protobufjs/float@^1.0.2": version "1.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" +======= + resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== "@protobufjs/inquire@^1.1.0": version "1.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" +======= + resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== "@protobufjs/path@^1.1.2": version "1.1.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" +======= + resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== "@protobufjs/pool@^1.1.0": version "1.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" +======= + resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== "@protobufjs/utf8@^1.1.0": version "1.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" +======= + resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== "@samverschueren/stream-to-observable@^0.3.0": @@ -600,12 +770,12 @@ "@types/mime-types@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz" - integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= + integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= sha512-8LDSKVdJxwfJXZAcHRwFDxozsTCo3UmIpDjN1cOnYMTr0h4ivK9I+IdEMdtjnssFm0y66vbnpd21mAgGZ1oGAQ== -"@types/minimatch@*": - version "3.0.3" - resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== +"@types/minimatch@*", "@types/minimatch@^3.0.4": + version "3.0.5" + resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minimatch@^3.0.4": version "3.0.5" @@ -617,7 +787,7 @@ resolved "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz" integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== -"@types/node@*", "@types/node@>= 8", "@types/node@^18.11.18", "@types/node@^18.15.11": +"@types/node@*", "@types/node@^18.0.0", "@types/node@^18.11.18", "@types/node@^18.15.11", "@types/node@>= 8", "@types/node@>=13.7.0": version "18.15.11" resolved "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz" integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== @@ -743,7 +913,7 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^3.5.0": +"@typescript-eslint/parser@^3.0.0", "@typescript-eslint/parser@^3.5.0": version "3.5.0" resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.5.0.tgz" integrity sha512-sU07VbYB70WZHtgOjH/qfAp1+OwaWgrvD1Km1VXqRpcVxt971PMTU7gJtlrCje0M+Sdz7xKAbtiyIu+Y6QdnVA== @@ -790,7 +960,7 @@ acorn-walk@^8.1.1: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^7.2.0: +"acorn@^6.0.0 || ^7.0.0", acorn@^7.2.0: version "7.3.1" resolved "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== @@ -802,7 +972,11 @@ acorn@^8.4.1: aes-js@4.0.0-beta.3: version "4.0.0-beta.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.3.tgz#da2253f0ff03a0b3a9e445c8cbdf78e7fda7d48c" +======= + resolved "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-/xJX0/VTPcbc5xQE2VUP91y1xN8q/rDfhEzLm+vLc3hYvb5+qHCnpJRuFcrKn63zumK/sCwYYzhG8HP78JYSTA== ajv-errors@^3.0.0: @@ -810,10 +984,20 @@ ajv-errors@^3.0.0: resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz" integrity sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ== -ajv@^6.10.0, ajv@^6.10.2: - version "6.12.6" - resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== +ajv@^6.10.0: + version "6.12.2" + resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz" + integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^6.10.2: + version "6.12.2" + resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz" + integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -830,9 +1014,9 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.12.0: +ajv@^8.0.1, ajv@^8.12.0: version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" @@ -840,16 +1024,16 @@ ajv@^8.12.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - ansi-colors@^3.2.1: version "3.2.4" resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz" @@ -858,19 +1042,24 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== ansi-regex@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz" - integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== + version "3.0.0" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= sha512-wFUFA5bg5dviipbQQ32yOQhl6gcJaJXiHE7dvR8VYPG97+J/GNC5FKGepKdEDUFeXRzDxPF1X/Btc8L+v7oqIQ== ansi-regex@^4.1.0: - version "4.1.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz" - integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== + version "4.1.0" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-regex@^5.0.0, ansi-regex@^5.0.1: +ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -878,7 +1067,7 @@ ansi-regex@^5.0.0, ansi-regex@^5.0.1: ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" @@ -909,7 +1098,11 @@ any-observable@^0.3.0: any-signal@^3.0.0: version "3.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-3.0.1.tgz#49cae34368187a3472e31de28fb5cb1430caa9a6" +======= + resolved "https://registry.npmjs.org/any-signal/-/any-signal-3.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg== anymatch@~3.1.2: @@ -944,10 +1137,10 @@ asn1@^0.2.4, asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" -assert-plus@1.0.0, assert-plus@^1.0.0: +assert-plus@^1.0.0, assert-plus@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== assertion-error@^1.1.0: version "1.1.0" @@ -969,12 +1162,12 @@ async-retry@^1.2.3: asynckit@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.8.0: version "1.10.0" @@ -984,9 +1177,9 @@ aws4@^1.8.0: balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg== -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== @@ -999,7 +1192,7 @@ base64-js@^1.3.1: bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== dependencies: tweetnacl "^0.14.3" @@ -1024,7 +1217,11 @@ bl@^4.0.1: blob-to-it@^2.0.0: version "2.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/blob-to-it/-/blob-to-it-2.0.3.tgz#ea76abbe7a158d77683a0b155de5ed8dd4c703f4" +======= + resolved "https://registry.npmjs.org/blob-to-it/-/blob-to-it-2.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Z3CAVpJMwB9B/lp+hOGEyD+6Rx690v1EBj37Wf/eF7ltXZEu2ppd2H9w/FFNGlx36PW5tsoynTNt2HwkgNV9hw== dependencies: browser-readablestream-to-it "^2.0.0" @@ -1053,12 +1250,20 @@ braces@~3.0.2: browser-readablestream-to-it@^1.0.0: version "1.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz#ac3e406c7ee6cdf0a502dd55db33bab97f7fba76" +======= + resolved "https://registry.npmjs.org/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw== browser-readablestream-to-it@^2.0.0: version "2.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-2.0.3.tgz#8c08c7c0d98aa1b4098fd19cb147a6028b188470" +======= + resolved "https://registry.npmjs.org/browser-readablestream-to-it/-/browser-readablestream-to-it-2.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-kFLXH4FWJNZbbIEeqZMCYfVPQx6glf3e1mReo3bB3xbn1o/YWbHsYpxIGo2rfNsmPqv7I+Fg4qObvtvbAq4DbA== browser-stdout@1.3.1: @@ -1079,18 +1284,46 @@ buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" +<<<<<<< HEAD buffer@^6.0.1, buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" +======= +buffer@^6.0.1: + version "6.0.3" + resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== dependencies: base64-js "^1.3.1" ieee754 "^1.2.1" +<<<<<<< HEAD buildcheck@~0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238" integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A== +======= +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + +buildcheck@0.0.5: + version "0.0.5" + resolved "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.5.tgz" + integrity sha512-jYWpRy8eedl/JZqkOeq0X0bNcaK04hXKhIi4gYsDKZUJWRjJJWViYfsMXO0BJQ40zSLcdLoa+iqe48Kz2PtQag== + +busboy@^1.6.0: + version "1.6.0" + resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz" + integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== + dependencies: + streamsearch "^1.1.0" +>>>>>>> integrate toolkit v1 busboy@^1.6.0: version "1.6.0" @@ -1133,7 +1366,12 @@ camelcase@^6.0.0: caseless@~0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== + +cborg@^1.10.0, cborg@^1.9.0: + version "1.10.1" + resolved "https://registry.npmjs.org/cborg/-/cborg-1.10.1.tgz" + integrity sha512-et6Qm8MOUY2kCWa5GKk2MlBVoPjHv0hQBmlzI/Z7+5V3VJCeIkGehIB3vWknNsm2kOkAIs6wEKJFJo8luWQQ/w== cborg@^1.10.0, cborg@^1.9.0: version "1.10.2" @@ -1153,10 +1391,21 @@ chai@^4.3.7: pathval "^1.1.1" type-detect "^4.0.5" -chalk@^1.0.0, chalk@^1.1.3: +chalk@^1.0.0: + version "1.1.3" + resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -1197,7 +1446,7 @@ chardet@^0.7.0: check-error@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= + integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== chokidar@3.5.3: version "3.5.3" @@ -1222,7 +1471,7 @@ chownr@^1.1.1: cli-cursor@^2.0.0, cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== dependencies: restore-cursor "^2.0.0" @@ -1237,7 +1486,7 @@ cli-progress@^3.8.2: cli-truncate@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz" - integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg== dependencies: slice-ansi "0.0.4" string-width "^1.0.1" @@ -1275,7 +1524,7 @@ clone-response@^1.0.2: code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== color-convert@^1.9.0: version "1.9.3" @@ -1291,16 +1540,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + colors@^1.1.2: version "1.4.0" resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz" @@ -1316,19 +1565,19 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: concat-map@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== core-util-is@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== cpu-features@~0.0.4: - version "0.0.7" - resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.7.tgz#81ba93e1d0a729fd25132a54c3ff689c37b542f7" - integrity sha512-fjzFmsUKKCrC9GrM1eQTvQx18e+kjXFzjRLvJPNEDjk31+bJ6ZiV6uchv/hzbzXVIgbWdrEyyX1IFKwse65+8w== + version "0.0.6" + resolved "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.6.tgz" + integrity sha512-Rj33pk//oVNh25YjsBaKtOkXNW7IARYxejWJosJkXqVPpbK+FrdpThPk6f4m3d+CEh2qMlkGx/SFt2Y1XSWN6g== dependencies: - buildcheck "~0.0.6" + buildcheck "0.0.5" nan "^2.17.0" create-require@^1.1.0: @@ -1338,7 +1587,11 @@ create-require@^1.1.0: cross-fetch@^3.1.5: version "3.1.6" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz#bae05aa31a4da760969756318feeee6e70f15d6c" +======= + resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g== dependencies: node-fetch "^2.6.11" @@ -1365,7 +1618,11 @@ cross-spawn@^7.0.2: dag-jose@^4.0.0: version "4.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/dag-jose/-/dag-jose-4.0.0.tgz#4e65f62af58dd5203b2b094eb52142ffe0cdec1d" +======= + resolved "https://registry.npmjs.org/dag-jose/-/dag-jose-4.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-tw595L3UYoOUT9dSJPbBEG/qpRpw24kRZxa5SLRnlnr+g5L7O8oEs1d3W5TiVA1oJZbthVsf0Vi3zFN66qcEBA== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -1374,7 +1631,7 @@ dag-jose@^4.0.0: dashdash@^1.12.0: version "1.14.1" resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== dependencies: assert-plus "^1.0.0" @@ -1383,20 +1640,17 @@ date-fns@^1.27.2: resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== +<<<<<<< HEAD debug@4.3.4, debug@^4.3.1, debug@^4.3.3: +======= +debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@4.3.4: +>>>>>>> integrate toolkit v1 version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@^4.0.1, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - decamelize@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz" @@ -1419,7 +1673,7 @@ deep-eql@^4.1.2: deep-is@^0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw== defer-to-connect@^2.0.0: version "2.0.1" @@ -1429,22 +1683,32 @@ defer-to-connect@^2.0.0: delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + diff@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dns-over-http-resolver@^2.1.0: + version "2.1.1" + resolved "https://registry.npmjs.org/dns-over-http-resolver/-/dns-over-http-resolver-2.1.1.tgz" + integrity sha512-Lm/eXB7yAQLJ5WxlBGwYfBY7utduXPZykcSmcG6K7ozM0wrZFvxZavhT6PqI0kd/5CUTfev/RrEFQqyU4CGPew== + dependencies: + debug "^4.3.1" + native-fetch "^4.0.2" + receptacle "^1.3.2" + undici "^5.12.0" dns-over-http-resolver@^2.1.0: version "2.1.1" @@ -1495,14 +1759,18 @@ duplexer3@^0.1.4: ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" electron-fetch@^1.7.2: version "1.9.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.9.1.tgz#e28bfe78d467de3f2dec884b1d72b8b05322f30f" +======= + resolved "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.9.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-M9qw6oUILGVrcENMSRRefE1MbHPIz0h79EKIeJWK9v563aT9Qkh8aEHPO1H5vi970wPirNY+jO9OpFoLiMsMGA== dependencies: encoding "^0.1.13" @@ -1510,7 +1778,11 @@ electron-fetch@^1.7.2: elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz" +<<<<<<< HEAD integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= +======= + integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ== +>>>>>>> integrate toolkit v1 emoji-regex@^7.0.1: version "7.0.3" @@ -1522,9 +1794,15 @@ emoji-regex@^8.0.0: resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +<<<<<<< HEAD encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" +======= +encoding@^0.1.0, encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: iconv-lite "^0.6.2" @@ -1545,7 +1823,11 @@ enquirer@^2.3.5: err-code@^3.0.1: version "3.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" +======= + resolved "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== escalade@^3.1.1: @@ -1553,16 +1835,16 @@ escalade@^3.1.1: resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + escape-string-regexp@4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - eslint-scope@^5.0.0, eslint-scope@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz" @@ -1583,7 +1865,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^7.3.1: +eslint@*, "eslint@^5.0.0 || ^6.0.0 || ^7.0.0", eslint@^7.3.1: version "7.3.1" resolved "https://registry.npmjs.org/eslint/-/eslint-7.3.1.tgz" integrity sha512-cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA== @@ -1627,7 +1909,11 @@ eslint@^7.3.1: esm@^3.2.25: version "3.2.25" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" +======= + resolved "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== espree@^7.1.0: @@ -1673,9 +1959,15 @@ esutils@^2.0.2: resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +<<<<<<< HEAD ethers@6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.3.0.tgz#c61efaafa2bd9a4d9f0c799d932ef3b5cd4bd37d" +======= +ethers@^6.3.0: + version "6.3.0" + resolved "https://registry.npmjs.org/ethers/-/ethers-6.3.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-CKFYvTne1YT4S1glTiu7TgGsj0t6c6GAD7evrIk8zbeUb6nK8dcUPAiAWM8uDX/1NmRTvLM9+1Vnn49hwKtEzw== dependencies: "@adraffy/ens-normalize" "1.9.0" @@ -1687,7 +1979,11 @@ ethers@6.3.0: eventemitter3@^4.0.7: version "4.0.7" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" +======= + resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== execa@^1.0.0: @@ -1717,15 +2013,10 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extsprintf@1.3.0: +extsprintf@^1.2.0, extsprintf@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== fast-deep-equal@^3.1.1: version "3.1.3" @@ -1734,7 +2025,11 @@ fast-deep-equal@^3.1.1: fast-fifo@^1.0.0: version "1.2.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.2.0.tgz#2ee038da2468e8623066dee96958b0c1763aa55a" +======= + resolved "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.2.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-NcvQXt7Cky1cNau15FWy64IjuO8X0JijhTBBrJj1YlxlDfRkJXNaK9RFUjwpfDPzMdv7wB38jr53l9tkNLxnWg== fast-json-stable-stringify@^2.0.0: @@ -1745,7 +2040,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== figlet@^1.2.3: version "1.4.0" @@ -1755,7 +2050,7 @@ figlet@^1.2.3: figures@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" - integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ== dependencies: escape-string-regexp "^1.0.5" object-assign "^4.1.0" @@ -1763,7 +2058,7 @@ figures@^1.7.0: figures@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== dependencies: escape-string-regexp "^1.0.5" @@ -1811,7 +2106,7 @@ flatted@^2.0.0: forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== form-data@^2.5.0: version "2.5.1" @@ -1848,17 +2143,12 @@ fs-constants@^1.0.0: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== get-caller-file@^2.0.5: version "2.0.5" @@ -1868,7 +2158,12 @@ get-caller-file@^2.0.5: get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= + integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== + +get-iterator@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/get-iterator/-/get-iterator-1.0.2.tgz" + integrity sha512-v+dm9bNVfOYsY1OrhaCrmyOcYoSeVvbt+hHZ0Au+T+p1y+0Uyj9aMaGIeUTT6xdpRbWzDeYKvfOslPhggQMcsg== get-iterator@^1.0.2: version "1.0.2" @@ -1892,7 +2187,7 @@ get-stream@^5.0.0, get-stream@^5.1.0: getpass@^0.1.1: version "0.1.7" resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== dependencies: assert-plus "^1.0.0" @@ -1903,7 +2198,7 @@ glob-parent@^5.0.0, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob@7.2.0: +glob@^7.1.3, glob@^7.1.6, glob@7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -1915,18 +2210,6 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.3, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - globals@^12.1.0: version "12.4.0" resolved "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz" @@ -1956,21 +2239,37 @@ got@^10.5.5: type-fest "^0.10.0" graphql-request@^6.0.0: +<<<<<<< HEAD version "6.1.0" resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f" integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw== +======= + version "6.0.0" + resolved "https://registry.npmjs.org/graphql-request/-/graphql-request-6.0.0.tgz" + integrity sha512-2BmHTuglonjZvmNVw6ZzCfFlW/qkIPds0f+Qdi/Lvjsl3whJg2uvHmSvHnLWhUTEw6zcxPYAHiZoPvSVKOZ7Jw== +>>>>>>> integrate toolkit v1 dependencies: "@graphql-typed-document-node/core" "^3.2.0" cross-fetch "^3.1.5" +<<<<<<< HEAD graphql@^16.6.0: version "16.6.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb" +======= +"graphql@^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "graphql@14 - 16": + version "16.6.0" + resolved "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw== hamt-sharding@^3.0.0: version "3.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/hamt-sharding/-/hamt-sharding-3.0.2.tgz#a3fba1e4e6b58469388a0e1458768c78c0cd95f6" +======= + resolved "https://registry.npmjs.org/hamt-sharding/-/hamt-sharding-3.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-f0DzBD2tSmLFdFsLAvOflIBqFPjerbA7BfmwO8mVho/5hXwgyyYhv+ijIzidQf/DpDX3bRjAQvhGoBFj+DBvPw== dependencies: sparse-array "^1.3.1" @@ -1979,7 +2278,7 @@ hamt-sharding@^3.0.0: har-schema@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== har-validator@~5.1.3: version "5.1.3" @@ -1992,14 +2291,14 @@ har-validator@~5.1.3: has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== dependencies: ansi-regex "^2.0.0" has-flag@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" @@ -2019,7 +2318,7 @@ http-cache-semantics@^4.0.0: http-signature@~1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" @@ -2034,15 +2333,26 @@ iconv-lite@^0.4.24: iconv-lite@^0.6.2: version "0.6.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" +======= + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" +<<<<<<< HEAD ieee754@^1.1.4: version "1.1.13" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== +======= +ieee754@^1.1.4, ieee754@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== +>>>>>>> integrate toolkit v1 ieee754@^1.2.1: version "1.2.1" @@ -2072,22 +2382,22 @@ import-fresh@^3.0.0: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== indent-string@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= + integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ== inflight@^1.0.4: version "1.0.6" resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: +inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@2: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2113,7 +2423,11 @@ inquirer@^6.2.1: interface-blockstore@^5.0.0: version "5.2.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-blockstore/-/interface-blockstore-5.2.0.tgz#150216529cf56bf43c2aebd3070f4351d1169ef4" +======= + resolved "https://registry.npmjs.org/interface-blockstore/-/interface-blockstore-5.2.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-lLW6fNP3PkBKghK9BsLuV8VMquL/o2lInomrTUizY/p4n7vxzVn3YT7qGTHywZzCcMIBeGMneDApGe21TNkg+g== dependencies: interface-store "^5.0.0" @@ -2121,7 +2435,11 @@ interface-blockstore@^5.0.0: interface-datastore@^7.0.0: version "7.0.4" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-7.0.4.tgz#f09ae4e2896f57f876d5d742a59e982fb3f42891" +======= + resolved "https://registry.npmjs.org/interface-datastore/-/interface-datastore-7.0.4.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Q8LZS/jfFFHz6XyZazLTAc078SSCoa27ZPBOfobWdpDiFO7FqPA2yskitUJIhaCgxNK8C+/lMBUTBNfVIDvLiw== dependencies: interface-store "^3.0.0" @@ -2130,7 +2448,11 @@ interface-datastore@^7.0.0: interface-datastore@^8.0.0: version "8.2.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-8.2.0.tgz#70076985ac17dcdb35b33c2b0f957480ce6489e1" +======= + resolved "https://registry.npmjs.org/interface-datastore/-/interface-datastore-8.2.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-rDMAcpCGxWMubRk2YQuSEHl11bc0xcZeBZzfLvqhoZJdByUWeo7YDJUdgyRKgD6liGXVYirtDkFU9nyn9xl2hg== dependencies: interface-store "^5.0.0" @@ -2139,17 +2461,29 @@ interface-datastore@^8.0.0: interface-store@^3.0.0: version "3.0.4" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-store/-/interface-store-3.0.4.tgz#670d95ef45f3b7061d154c3cbfaf39a538167ad7" +======= + resolved "https://registry.npmjs.org/interface-store/-/interface-store-3.0.4.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-OjHUuGXbH4eXSBx1TF1tTySvjLldPLzRSYYXJwrEQI+XfH5JWYZofr0gVMV4F8XTwC+4V7jomDYkvGRmDSRKqQ== interface-store@^5.0.0: version "5.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-store/-/interface-store-5.1.0.tgz#1735cead844fe452d62c307fafbaaa1d261e6ff3" +======= + resolved "https://registry.npmjs.org/interface-store/-/interface-store-5.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-mjUwX3XSoreoxCS3sXS3pSRsGnUjl9T06KBqt/T7AgE9Sgp4diH64ZyURJKnj2T5WmCvTbC0Dm+mwQV5hfLSBQ== ipfs-core-types@^0.14.0: version "0.14.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.14.0.tgz#a301d534f5261aad2254da393cb09f9cd36b6742" +======= + resolved "https://registry.npmjs.org/ipfs-core-types/-/ipfs-core-types-0.14.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-qO1xVO3n5m7scTXXtMz8hDTLdwXInnwqadIDQpXC446BIlaYyRWUvLcFQ2bOjQql9/CPNTaPHzjzr5Y1XxqpJw== dependencies: "@ipld/dag-pb" "^4.0.0" @@ -2165,7 +2499,11 @@ ipfs-core-types@^0.14.0: ipfs-core-utils@^0.18.0: version "0.18.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.18.0.tgz#c528c6cfb231d3a1a0d5420d0a3506615d26f4b4" +======= + resolved "https://registry.npmjs.org/ipfs-core-utils/-/ipfs-core-utils-0.18.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-7N/KfsOPGJu9mwN8EQwrW9HXgS5RNM3WUyjIMWk49KlpYmsXectXuC9i6npI1vn1W/oUaIOZt3lHx37jecnepw== dependencies: "@libp2p/logger" "^2.0.0" @@ -2191,7 +2529,11 @@ ipfs-core-utils@^0.18.0: ipfs-http-client@^60.0.0: version "60.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-60.0.0.tgz#429ca98544ee1fde79f96ee055d95a789384247c" +======= + resolved "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-60.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-d6Rqc1UP5nWhp7j0PumK80CA5LvbTvskro+qGw7hgWvbfQ0rX/5ddig7ELvVYJbJM4YBxCJSaSHDEOGoSpzzKg== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -2216,7 +2558,11 @@ ipfs-http-client@^60.0.0: ipfs-unixfs-exporter@^13.1.5: version "13.1.5" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-13.1.5.tgz#345ab63c10671af926630447c40059f8d8107533" +======= + resolved "https://registry.npmjs.org/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-13.1.5.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-O5aMawsHoe4DaYk5FFil2EPrNOaU3pkHC6qUR5JMnW7es93W3b/RjJoO7AyDL1rpb+M3K0oRu86Yc5wLNQQ8jg== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -2239,7 +2585,11 @@ ipfs-unixfs-exporter@^13.1.5: ipfs-unixfs@^11.0.0: version "11.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-11.0.1.tgz#7232e888b15a785aef7a5bd4dedf1861401f3b63" +======= + resolved "https://registry.npmjs.org/ipfs-unixfs/-/ipfs-unixfs-11.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-SD9dqn14bfgMfkPstsR/2Av3zCzYMj2ntQJab4HZucgX4nNV6K7guZh4Hf3kiL8ONff1Ogft1ekFU083DIKEdQ== dependencies: err-code "^3.0.1" @@ -2248,7 +2598,11 @@ ipfs-unixfs@^11.0.0: ipfs-unixfs@^9.0.0: version "9.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-9.0.1.tgz#d06e688e07ef4ce08d610337ba2fe8c143c386e7" +======= + resolved "https://registry.npmjs.org/ipfs-unixfs/-/ipfs-unixfs-9.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-jh2CbXyxID+v3jLml9CqMwjdSS9ZRnsGfQGGPOfem0/hT/L48xUeTPvh7qLFWkZcIMhZtG+fnS1teei8x5uGBg== dependencies: err-code "^3.0.1" @@ -2256,7 +2610,11 @@ ipfs-unixfs@^9.0.0: ipfs-utils@^9.0.13: version "9.0.14" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-9.0.14.tgz#24f5fda1f4567685eb32bca2543d518f95fd8704" +======= + resolved "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-9.0.14.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-zIaiEGX18QATxgaS0/EOQNoo33W0islREABAcxXE8n7y2MGAlB+hdsxXn4J0hGZge8IqVQhW8sWIb+oJz2yEvg== dependencies: any-signal "^3.0.0" @@ -2285,44 +2643,52 @@ is-binary-path@~2.1.0: is-electron@^2.2.0: version "2.2.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.2.tgz#3778902a2044d76de98036f5dc58089ac4d80bb9" +======= + resolved "https://registry.npmjs.org/is-electron/-/is-electron-2.2.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg== is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== dependencies: number-is-nan "^1.0.0" is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" -is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== +is-ipfs@^8.0.1: + version "8.0.1" + resolved "https://registry.npmjs.org/is-ipfs/-/is-ipfs-8.0.1.tgz" + integrity sha512-hoBSElmPath3aDdtaOpVZsuCh2SXTqvLML+H75S7iDgKdqNmENJ6tsRucP1HLfpqEyZ/uIlj/+ZBxIC/F8B5Eg== dependencies: - is-extglob "^2.1.1" + "@multiformats/mafmt" "^11.0.3" + "@multiformats/multiaddr" "^11.0.0" + iso-url "^1.1.3" + multiformats "^11.0.0" + uint8arrays "^4.0.2" is-ipfs@^8.0.1: version "8.0.1" @@ -2370,12 +2736,12 @@ is-promise@^2.1.0: is-stream@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== is-unicode-supported@^0.1.0: version "0.1.0" @@ -2385,7 +2751,12 @@ is-unicode-supported@^0.1.0: isexe@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +iso-url@^1.1.3, iso-url@^1.1.5: + version "1.2.1" + resolved "https://registry.npmjs.org/iso-url/-/iso-url-1.2.1.tgz" + integrity sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng== iso-url@^1.1.3, iso-url@^1.1.5: version "1.2.1" @@ -2395,8 +2766,26 @@ iso-url@^1.1.3, iso-url@^1.1.5: isstream@~0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== + +it-all@^1.0.4: + version "1.0.6" + resolved "https://registry.npmjs.org/it-all/-/it-all-1.0.6.tgz" + integrity sha512-3cmCc6Heqe3uWi3CVM/k51fa/XbMFpQVzFoDsV0IZNHSQDyAXl3c4MjHkFX5kF3922OGj7Myv1nSEUgRtcuM1A== + +it-all@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/it-all/-/it-all-2.0.1.tgz" + integrity sha512-9UuJcCRZsboz+HBQTNOau80Dw+ryGaHYFP/cPYzFBJBFcfDathMYnhHk4t52en9+fcyDGPTdLB+lFc1wzQIroA== + +it-filter@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/it-filter/-/it-filter-3.0.2.tgz" + integrity sha512-Hhzp5anX7tmKOBqTPasBYTPlq7l4Xk4lMBfLB5GfKZnL9WCc6pr8M9Waud4nHh3s9neb4xwDWk7KQsEapgWyJw== + dependencies: + it-peekable "^3.0.0" +<<<<<<< HEAD it-all@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/it-all/-/it-all-1.0.6.tgz#852557355367606295c4c3b7eff0136f07749335" @@ -2417,11 +2806,20 @@ it-filter@^3.0.2: it-first@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/it-first/-/it-first-2.0.1.tgz#75d66b254c385ae3a1906def060a69006a437cef" +======= +it-first@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/it-first/-/it-first-2.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-noC1oEQcWZZMUwq7VWxHNLML43dM+5bviZpfmkxkXlvBe60z7AFRqpZSga9uQBo792jKv9otnn1IjA4zwgNARw== it-glob@^1.0.1: version "1.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-glob/-/it-glob-1.0.2.tgz#bab9b04d6aaac42884502f3a0bfee84c7a29e15e" +======= + resolved "https://registry.npmjs.org/it-glob/-/it-glob-1.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Ch2Dzhw4URfB9L/0ZHyY+uqOnKvBNeS/SMcRiPmJfpHiM0TsUZn+GkpcZxAoF3dJVdPm/PuIk3A4wlV7SUo23Q== dependencies: "@types/minimatch" "^3.0.4" @@ -2429,53 +2827,89 @@ it-glob@^1.0.1: it-last@^2.0.0: version "2.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-last/-/it-last-2.0.1.tgz#a6f3253459cb77e917aeada3b2c4ae9f3e66c64b" +======= + resolved "https://registry.npmjs.org/it-last/-/it-last-2.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-uVMedYW0wa2Cx0TAmcOCLbfuLLII7+vyURmhKa8Zovpd+aBTMsmINtsta2n364wJ5qsEDBH+akY1sUtAkaYBlg== it-last@^3.0.2: version "3.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-last/-/it-last-3.0.2.tgz#b012d88d2cc0d1e01eedf2b5114cefd94cef6c9b" +======= + resolved "https://registry.npmjs.org/it-last/-/it-last-3.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-aWoA5moJ7XSKe7+YuutBKhySroDDWkfjpo+UknekPh1M5YYdK4YNSPDarR+7o/NqRwzazwgzCi2UZzU0oqsprQ== it-map@^2.0.0: version "2.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-map/-/it-map-2.0.1.tgz#d5251fd6b222d6ee39293d406a3f8fce54fb9220" +======= + resolved "https://registry.npmjs.org/it-map/-/it-map-2.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-a2GcYDHiAh/eSU628xlvB56LA98luXZnniH2GlD0IdBzf15shEq9rBeb0Rg3o1SWtNILUAwqmQxEXcewGCdvmQ== it-map@^3.0.3: version "3.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-map/-/it-map-3.0.3.tgz#42be39fc68dc9b0d70cfd8ac4b8311d4b5cd7f22" +======= + resolved "https://registry.npmjs.org/it-map/-/it-map-3.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Yf89GJYeYUZb2NZzWkvFHm3IBXlxro74i2vGRmpf8BYau3BhlaS37ieDenJEdYzkTGJhL/EbM1jPPw/KGVVVIw== dependencies: it-peekable "^3.0.0" it-merge@^3.0.0: version "3.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-merge/-/it-merge-3.0.1.tgz#20cc293593586e5afcbfed8ba88a94def5ccfcfa" +======= + resolved "https://registry.npmjs.org/it-merge/-/it-merge-3.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-I6hjU1ABO+k3xY1H6JtCSDXvUME88pxIXSgKeT4WI5rPYbQzpr98ldacVuG95WbjaJxKl6Qot6lUdxduLBQPHA== dependencies: it-pushable "^3.1.0" it-parallel@^3.0.0: version "3.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-parallel/-/it-parallel-3.0.3.tgz#b02f1d6459418c7253ecf13e367111560a616491" +======= + resolved "https://registry.npmjs.org/it-parallel/-/it-parallel-3.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Q5KmdvERHCOLDcgKqrzQ+yiMCdG6H9h7ZL3Zjx/Tx9xhZy8txSKoy+EiCgWZFs0rfYvxJhk6UkOpKLzJ1zM9ZA== dependencies: p-defer "^4.0.0" it-peekable@^2.0.0: version "2.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-peekable/-/it-peekable-2.0.1.tgz#1e118610473aa511efc70f3bb7a7066178728dd3" +======= + resolved "https://registry.npmjs.org/it-peekable/-/it-peekable-2.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-fJ/YTU9rHRhGJOM2hhQKKEfRM6uKB9r4yGGFLBHqp72ACC8Yi6+7/FhuBAMG8cpN6mLoj9auVX7ZJ3ul6qFpTA== it-peekable@^3.0.0: version "3.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-peekable/-/it-peekable-3.0.1.tgz#530953f735359c10503e961c059602f8a366a1a5" +======= + resolved "https://registry.npmjs.org/it-peekable/-/it-peekable-3.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-5zBfkf6e+YoxxWV0YDXMwdQKnc7eeTX6xo3WYPm/8dIoctIiDnddInRWOW+83W/8/76sbnpWqqsO4gSyXandeQ== it-pipe@^3.0.1: version "3.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-pipe/-/it-pipe-3.0.1.tgz#b25720df82f4c558a8532602b5fbc37bbe4e7ba5" +======= + resolved "https://registry.npmjs.org/it-pipe/-/it-pipe-3.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-sIoNrQl1qSRg2seYSBH/3QxWhJFn9PKYvOf/bHdtCBF0bnghey44VyASsWzn5dAx0DCDDABq1hZIuzKmtBZmKA== dependencies: it-merge "^3.0.0" @@ -2484,22 +2918,38 @@ it-pipe@^3.0.1: it-pushable@^3.0.0, it-pushable@^3.1.0, it-pushable@^3.1.2: version "3.1.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-pushable/-/it-pushable-3.1.3.tgz#b6f4a1e0236502f12b5661b40468b629799baf0e" +======= + resolved "https://registry.npmjs.org/it-pushable/-/it-pushable-3.1.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-f50iQ85HISS6DaWCyrqf9QJ6G/kQtKIMf9xZkgZgyOvxEQDfn8OfYcLXXquCqgoLboxQtAW1ZFZyFIAsLHDtJw== it-stream-types@^1.0.4: version "1.0.5" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-stream-types/-/it-stream-types-1.0.5.tgz#9c72e6adefdea9dac69d0a28fbea783deebd508d" +======= + resolved "https://registry.npmjs.org/it-stream-types/-/it-stream-types-1.0.5.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-I88Ka1nHgfX62e5mi5LLL+oueqz7Ltg0bUdtsUKDe9SoUqbQPf2Mp5kxDTe9pNhHQGs4pvYPAINwuZ1HAt42TA== it-stream-types@^2.0.1: version "2.0.1" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-stream-types/-/it-stream-types-2.0.1.tgz#69cb4d7e79e707b8257a8997e02751ccb6c3af32" +======= + resolved "https://registry.npmjs.org/it-stream-types/-/it-stream-types-2.0.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-6DmOs5r7ERDbvS4q8yLKENcj6Yecr7QQTqWApbZdfAUTEC947d+PEha7PCqhm//9oxaLYL7TWRekwhoXl2s6fg== it-to-stream@^1.0.0: version "1.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-to-stream/-/it-to-stream-1.0.0.tgz#6c47f91d5b5df28bda9334c52782ef8e97fe3a4a" +======= + resolved "https://registry.npmjs.org/it-to-stream/-/it-to-stream-1.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-pLULMZMAB/+vbdvbZtebC0nWBTbG581lk6w8P7DfIIIKUfa8FbY7Oi0FxZcFPbxvISs7A9E+cMpLDBc1XhpAOA== dependencies: buffer "^6.0.3" @@ -2514,13 +2964,6 @@ js-tokens@^4.0.0: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - js-yaml@^3.12.1, js-yaml@^3.13.1: version "3.14.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz" @@ -2529,10 +2972,17 @@ js-yaml@^3.12.1, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== json-buffer@3.0.1: version "3.0.1" @@ -2549,29 +2999,29 @@ json-schema-traverse@^1.0.0: resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= sha512-a3xHnILGMtk+hDOqNwHzF6e2fNbiMrXZvxKQiEv2MlgQP+pjIOzqAmKYD2mDpXYE/44M7g+n9p2bKkYWDUcXCQ== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== jsprim@^1.2.2: - version "1.4.2" - resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz" - integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== + version "1.4.1" + resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= sha512-4Dj8Rf+fQ+/Pn7C5qeEX02op1WfOss3PKTE9Nsop3Dx+6UPxlm1dr/og7o2cRa5hNN07CACr4NFzRLtj/rjWog== dependencies: assert-plus "1.0.0" extsprintf "1.3.0" - json-schema "0.4.0" + json-schema "0.2.3" verror "1.10.0" keyv@^4.0.0: @@ -2592,7 +3042,7 @@ levn@^0.4.1: listr-silent-renderer@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz" - integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA== listr-update-renderer@^0.5.0: version "0.5.0" @@ -2618,7 +3068,7 @@ listr-verbose-renderer@^0.5.0: date-fns "^1.27.2" figures "^2.0.0" -listr@^0.14.3: +listr@^0.14.2, listr@^0.14.3: version "0.14.3" resolved "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz" integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== @@ -2646,9 +3096,16 @@ lodash-es@^4.17.21: integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15: - version "4.17.21" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + version "4.17.19" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ== + dependencies: + chalk "^1.0.0" log-symbols@4.1.0: version "4.1.0" @@ -2658,17 +3115,10 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" -log-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz" - integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= - dependencies: - chalk "^1.0.0" - log-update@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz" - integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= + integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg== dependencies: ansi-escapes "^3.0.0" cli-cursor "^2.0.0" @@ -2676,7 +3126,11 @@ log-update@^2.3.0: long@^5.0.0: version "5.2.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" +======= + resolved "https://registry.npmjs.org/long/-/long-5.2.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== loupe@^2.3.1: @@ -2693,7 +3147,7 @@ lowercase-keys@^2.0.0: lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: yallist "^4.0.0" @@ -2710,7 +3164,11 @@ make-error@^1.1.1: merge-options@^3.0.4: version "3.0.4" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" +======= + resolved "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== dependencies: is-plain-obj "^2.1.0" @@ -2742,6 +3200,16 @@ mimic-response@^2.0.0, mimic-response@^2.1.0: resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +<<<<<<< HEAD +======= +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +>>>>>>> integrate toolkit v1 minimatch@5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" @@ -2749,17 +3217,10 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.4: - version "3.1.2" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - minimist@^1.2.5: - version "1.2.8" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + version "1.2.5" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== mkdirp-classic@^0.5.2: version "0.5.3" @@ -2801,11 +3262,11 @@ mocha@^10.2.0: yargs-unparser "2.0.0" moment@^2.27.0: - version "2.29.4" - resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" - integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + version "2.27.0" + resolved "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz" + integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== -ms@2.1.2, ms@^2.1.1: +ms@^2.1.1, ms@2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== @@ -2817,29 +3278,38 @@ ms@2.1.3: multiformats@^11.0.0, multiformats@^11.0.2: version "11.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-11.0.2.tgz#b14735efc42cd8581e73895e66bebb9752151b60" +======= + resolved "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg== murmurhash3js-revisited@^3.0.0: version "3.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz#6bd36e25de8f73394222adc6e41fa3fac08a5869" +======= + resolved "https://registry.npmjs.org/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-/sF3ee6zvScXMb1XFJ8gDsSnY+X8PbOyjIuBhtgis10W2Jx4ZjIhikUCIF9c4gpJxVnQIsPAFrSwTCuAjicP6g== mute-stream@0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== nan@^2.16.0, nan@^2.17.0: version "2.17.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + resolved "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== -nanoid@3.3.3: +nanoid@^3.1.20, nanoid@3.3.3: version "3.3.3" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== +<<<<<<< HEAD nanoid@^3.1.20: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" @@ -2848,32 +3318,45 @@ nanoid@^3.1.20: nanoid@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-4.0.2.tgz#140b3c5003959adbebf521c170f282c5e7f9fb9e" +======= +nanoid@^4.0.0: + version "4.0.2" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw== native-fetch@^3.0.0: version "3.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-3.0.0.tgz#06ccdd70e79e171c365c75117959cf4fe14a09bb" +======= + resolved "https://registry.npmjs.org/native-fetch/-/native-fetch-3.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw== native-fetch@^4.0.2: version "4.0.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-4.0.2.tgz#75c8a44c5f3bb021713e5e24f2846750883e49af" +======= + resolved "https://registry.npmjs.org/native-fetch/-/native-fetch-4.0.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-4QcVlKFtv2EYVS5MBgsGX5+NWKtbDbIECdUXDBGDMAZXq3Jkv9zf+y8iS7Ub8fEdga3GpYeazp9gauNqXHJOCg== natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== nice-try@^1.0.4: version "1.0.5" resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch@^2.6.1: - version "2.6.9" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== +node-fetch@*, node-fetch@^2.6.1, node-fetch@^2.6.11, node-fetch@^2.6.8: + version "2.6.11" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" @@ -2897,14 +3380,14 @@ normalize-url@^6.0.1: npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw== dependencies: path-key "^2.0.0" number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== oauth-sign@~0.9.0: version "0.9.0" @@ -2914,19 +3397,19 @@ oauth-sign@~0.9.0: object-assign@^4.1.0: version "4.1.1" resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" onetime@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== dependencies: mimic-fn "^1.0.0" @@ -2953,7 +3436,7 @@ os-name@^3.1.0: os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== p-cancelable@^2.0.0: version "2.1.1" @@ -2962,12 +3445,20 @@ p-cancelable@^2.0.0: p-defer@^3.0.0: version "3.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" +======= + resolved "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== p-defer@^4.0.0: version "4.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-4.0.0.tgz#8082770aeeb10eb6b408abe91866738741ddd5d2" +======= + resolved "https://registry.npmjs.org/p-defer/-/p-defer-4.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Vb3QRvQ0Y5XnF40ZUWW7JfLogicVh/EnA5gBIvKDJoYpeI82+1E3AlB9yOcKFS0AhHrWVnAQO39fbR0G99IVEQ== p-event@^4.0.0: @@ -2979,7 +3470,11 @@ p-event@^4.0.0: p-fifo@^1.0.0: version "1.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-fifo/-/p-fifo-1.0.0.tgz#e29d5cf17c239ba87f51dde98c1d26a9cfe20a63" +======= + resolved "https://registry.npmjs.org/p-fifo/-/p-fifo-1.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-IjoCxXW48tqdtDFz6fqo5q1UfFVjjVZe8TC1QRflvNUJtNfCUhxOUw6MOVZhDPjqhSzc26xKdugsO17gmzd5+A== dependencies: fast-fifo "^1.0.0" @@ -2988,7 +3483,7 @@ p-fifo@^1.0.0: p-finally@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== p-limit@^3.0.2: version "3.1.0" @@ -3011,7 +3506,11 @@ p-map@^2.0.0: p-queue@^7.3.0: version "7.3.4" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-7.3.4.tgz#7ef7d89b6c1a0563596d98adbc9dc404e9ed4a84" +======= + resolved "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg== dependencies: eventemitter3 "^4.0.7" @@ -3026,7 +3525,11 @@ p-timeout@^3.1.0: p-timeout@^5.0.2: version "5.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b" +======= + resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew== parent-module@^1.0.0: @@ -3038,7 +3541,11 @@ parent-module@^1.0.0: parse-duration@^1.0.0: version "1.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.0.3.tgz#b6681f5edcc2689643b34c09ea63f86f58a35814" +======= + resolved "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-o6NAh12na5VvR6nFejkU0gpQ8jmOY9Y9sTU2ke3L3G/d/3z8jqmbBbeyBGHU73P4JLXfc7tJARygIK3WGIkloA== path-exists@^4.0.0: @@ -3049,12 +3556,17 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== -path-key@^2.0.0, path-key@^2.0.1: +path-key@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== path-key@^3.1.0: version "3.1.1" @@ -3069,7 +3581,7 @@ pathval@^1.1.1: performance-now@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" @@ -3088,7 +3600,11 @@ prettier@^2.1.2: progress-events@^1.0.0: version "1.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/progress-events/-/progress-events-1.0.0.tgz#34f5e8fdb5dae3561837b22672d1e02277bb2109" +======= + resolved "https://registry.npmjs.org/progress-events/-/progress-events-1.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-zIB6QDrSbPfRg+33FZalluFIowkbV5Xh1xSuetjG+rlC5he6u2dc6VQJ0TbMdlN3R1RHdpOqxEFMKTnQ+itUwA== progress@^2.0.0: @@ -3098,7 +3614,11 @@ progress@^2.0.0: protobufjs@^7.0.0: version "7.2.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2" +======= + resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg== dependencies: "@protobufjs/aspromise" "^1.1.2" @@ -3116,7 +3636,11 @@ protobufjs@^7.0.0: protons-runtime@^5.0.0: version "5.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/protons-runtime/-/protons-runtime-5.0.0.tgz#1eb3c78637ff02cc90bb030e3bff6f0402109c25" +======= + resolved "https://registry.npmjs.org/protons-runtime/-/protons-runtime-5.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-QqjGnPGkpvbzq0dITzhG9DVK10rRIHf7nePcU2QQVVpFGuYbwrOWnvGSvei1GcceAzB9syTz6vHzvTPmGRR0PA== dependencies: protobufjs "^7.0.0" @@ -3141,9 +3665,9 @@ punycode@^2.1.0, punycode@^2.1.1: integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== qs@~6.5.2: - version "6.5.3" - resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz" - integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== + version "6.5.2" + resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== queue@6.0.1: version "6.0.1" @@ -3161,6 +3685,7 @@ randombytes@^2.1.0: react-native-fetch-api@^3.0.0: version "3.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz#81e1bb6562c292521bc4eca52fe1097f4c1ebab5" integrity sha512-g2rtqPjdroaboDKTsJCTlcmtw54E25OjyaunUP0anOZn4Fuo2IKs8BVfe02zVggA/UysbmfSnRJIqtNkAgggNA== dependencies: @@ -3170,12 +3695,18 @@ readable-stream@^3.1.1, readable-stream@^3.4.0: version "3.6.0" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== +======= + resolved "https://registry.npmjs.org/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz" + integrity sha512-g2rtqPjdroaboDKTsJCTlcmtw54E25OjyaunUP0anOZn4Fuo2IKs8BVfe02zVggA/UysbmfSnRJIqtNkAgggNA== +>>>>>>> integrate toolkit v1 dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" + p-defer "^3.0.0" +<<<<<<< HEAD readable-stream@^3.5.0, readable-stream@^3.6.0: +======= +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: +>>>>>>> integrate toolkit v1 version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -3193,7 +3724,11 @@ readdirp@~3.6.0: receptacle@^1.3.2: version "1.3.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/receptacle/-/receptacle-1.3.2.tgz#a7994c7efafc7a01d0e2041839dab6c4951360d2" +======= + resolved "https://registry.npmjs.org/receptacle/-/receptacle-1.3.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-HrsFvqZZheusncQRiEE7GatOAETrARKV/lnfYicIm8lbvp/JQOdADOfhjBd2DajvoszEyxSM6RlAAIZgEoeu/A== dependencies: ms "^2.1.1" @@ -3232,7 +3767,7 @@ request@^2.88.2: require-directory@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== require-from-string@^2.0.2: version "2.0.2" @@ -3254,27 +3789,24 @@ responselike@^2.0.0: restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== dependencies: onetime "^2.0.0" signal-exit "^3.0.2" retimer@^3.0.0: version "3.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/retimer/-/retimer-3.0.0.tgz#98b751b1feaf1af13eb0228f8ea68b8f9da530df" +======= + resolved "https://registry.npmjs.org/retimer/-/retimer-3.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-WKE0j11Pa0ZJI5YIk0nflGI7SQsfl2ljihVy7ogh7DeQSeYAUi0ubZ/yEueGtDfUPk6GH5LRw1hBdLq4IwUBWA== retry@0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= - -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== rimraf@^3.0.2: version "3.0.2" @@ -3283,6 +3815,13 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@2.6.3: + version "2.6.3" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + run-async@^2.2.0: version "2.4.1" resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz" @@ -3300,7 +3839,11 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +<<<<<<< HEAD "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +======= +safer-buffer@^2.0.2, safer-buffer@^2.1.0, "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@~2.1.0: +>>>>>>> integrate toolkit v1 version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -3310,15 +3853,20 @@ semver@^5.5.0, semver@^5.6.0: resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^7.2.1, semver@^7.3.2: +semver@^7.2.1: + version "7.3.2" + resolved "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + +semver@^7.3.2: version "7.3.2" resolved "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== semver@^7.5.0: - version "7.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" - integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== + version "7.5.1" + resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz" + integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== dependencies: lru-cache "^6.0.0" @@ -3332,7 +3880,7 @@ serialize-javascript@6.0.0: shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== dependencies: shebang-regex "^1.0.0" @@ -3346,7 +3894,7 @@ shebang-command@^2.0.0: shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== shebang-regex@^3.0.0: version "3.0.0" @@ -3358,11 +3906,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== -slice-ansi@0.0.4: - version "0.0.4" - resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz" - integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= - slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz" @@ -3372,6 +3915,11 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw== + source-map-support@^0.5.19: version "0.5.19" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" @@ -3387,7 +3935,11 @@ source-map@^0.6.0: sparse-array@^1.3.1: version "1.3.2" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/sparse-array/-/sparse-array-1.3.2.tgz#0e1a8b71706d356bc916fe754ff496d450ec20b0" +======= + resolved "https://registry.npmjs.org/sparse-array/-/sparse-array-1.3.2.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-ZT711fePGn3+kQyLuv1fpd3rNSkNF8vd5Kv2D+qnOANeyKs3fx6bUMGWRPvgTTcYV64QMqZKZwcuaQSP3AZ0tg== split-ca@^1.0.1: @@ -3398,7 +3950,7 @@ split-ca@^1.0.1: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== ssh2@^1.11.0: version "1.11.0" @@ -3428,26 +3980,51 @@ sshpk@^1.7.0: stream-to-it@^0.2.2: version "0.2.4" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/stream-to-it/-/stream-to-it-0.2.4.tgz#d2fd7bfbd4a899b4c0d6a7e6a533723af5749bd0" +======= + resolved "https://registry.npmjs.org/stream-to-it/-/stream-to-it-0.2.4.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-4vEbkSs83OahpmBybNJXlJd7d6/RxzkkSdT3I0mnGt79Xd2Kk+e1JqbvAvsQfCeKj3aKb0QIWkyK3/n0j506vQ== dependencies: get-iterator "^1.0.2" streamsearch@^1.1.0: version "1.1.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== +======= + resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" + integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +>>>>>>> integrate toolkit v1 string-width@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.1.0, string-width@^2.1.1: +string-width@^2.1.0: + version "2.1.1" + resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -3464,7 +4041,7 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3473,33 +4050,17 @@ string-width@^4.1.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== dependencies: ansi-regex "^3.0.0" @@ -3527,24 +4088,17 @@ strip-ansi@^6.0.1: strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== -strip-json-comments@3.1.1, strip-json-comments@^3.1.0: +strip-json-comments@^3.1.0, strip-json-comments@3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== supports-color@^5.3.0: version "5.5.0" @@ -3560,6 +4114,13 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz" @@ -3609,12 +4170,19 @@ tar-stream@^2.0.0: text-table@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== through@^2.3.6: version "2.3.8" resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + +timeout-abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/timeout-abort-controller/-/timeout-abort-controller-3.0.0.tgz" + integrity sha512-O3e+2B8BKrQxU2YRyEjC/2yFdb33slI22WRdUaDx6rvysfi9anloNZyR2q0l6LnePo5qH7gSM7uZtvvwZbc2yA== + dependencies: + retimer "^3.0.0" timeout-abort-controller@^3.0.0: version "3.0.0" @@ -3689,6 +4257,11 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== +tslib@2.4.0: + version "2.4.0" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz" @@ -3699,14 +4272,14 @@ tsutils@^3.17.1: tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -3730,28 +4303,42 @@ type-fest@^0.8.1: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -typescript@^4.7.3: +typescript@^4.7.3, typescript@>=2.7, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta": version "4.7.3" resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== uint8arraylist@^2.1.2, uint8arraylist@^2.4.3: version "2.4.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/uint8arraylist/-/uint8arraylist-2.4.3.tgz#1148aa979b407d382e4eb8d9c8f2b4bf3f5910d5" +======= + resolved "https://registry.npmjs.org/uint8arraylist/-/uint8arraylist-2.4.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-oEVZr4/GrH87K0kjNce6z8pSCzLEPqHNLNR5sj8cJOySrTP8Vb/pMIbZKLJGhQKxm1TiZ31atNrpn820Pyqpow== dependencies: uint8arrays "^4.0.2" uint8arrays@^4.0.2: version "4.0.3" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-4.0.3.tgz#43109c03c4c10d312e7f2e9f4d53e5cd2398c7fd" +======= + resolved "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.3.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-b+aKlI2oTnxnfeSQWV1sMacqSNxqhtXySaH6bflvONGxF8V/fT3ZlYH7z2qgGfydsvpVo4JUgM/Ylyfl2YouCg== dependencies: multiformats "^11.0.0" +<<<<<<< HEAD undici@^5.12.0: version "5.22.1" resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b" +======= +undici@*, undici@^5.12.0: + version "5.22.1" + resolved "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw== dependencies: busboy "^1.6.0" @@ -3778,7 +4365,7 @@ uri-js@^4.2.2: util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== uuid@^3.3.2: version "3.4.0" @@ -3797,13 +4384,17 @@ v8-compile-cache@^2.0.3: varint@^6.0.0: version "6.0.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" +======= + resolved "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== verror@1.10.0: version "1.10.0" resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -3856,7 +4447,7 @@ workerpool@6.2.1: wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz" - integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= + integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ== dependencies: string-width "^2.1.1" strip-ansi "^4.0.0" @@ -3873,7 +4464,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== write@1.0.3: version "1.0.3" @@ -3884,7 +4475,11 @@ write@1.0.3: ws@8.5.0: version "8.5.0" +<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" +======= + resolved "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz" +>>>>>>> integrate toolkit v1 integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== y18n@^5.0.5: @@ -3894,24 +4489,27 @@ y18n@^5.0.5: yallist@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^2.2.2: +<<<<<<< HEAD version "2.3.0" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.0.tgz#47ebe58ee718f772ce65862beb1db816210589a0" integrity sha512-8/1wgzdKc7bc9E6my5wZjmdavHLvO/QOmLG1FBugblEvY4IXrLjlViIOmL24HthU042lWTDRO90Fz1Yp66UnMw== yargs-parser@20.2.4: +======= + version "2.2.2" + resolved "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz" + integrity sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA== + +yargs-parser@^20.2.2, yargs-parser@20.2.4: +>>>>>>> integrate toolkit v1 version "20.2.4" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" @@ -3927,19 +4525,6 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - yargs@^17.7.1: version "17.7.1" resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz" @@ -3953,6 +4538,19 @@ yargs@^17.7.1: y18n "^5.0.5" yargs-parser "^21.1.1" +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yn@3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz" From 4670338d335ad4bf7063ed88de3a9a864b4e3868 Mon Sep 17 00:00:00 2001 From: Marc Font Date: Mon, 22 May 2023 23:49:31 +0200 Subject: [PATCH 2/6] refactor APM usage --- src/tasks/generatePublishTx.ts | 22 ++++-- src/utils/Apm.ts | 117 +++++++------------------------ src/utils/verifyEthConnection.ts | 14 ++++ test/utils/Apm.test.ts | 20 ++---- 4 files changed, 60 insertions(+), 113 deletions(-) diff --git a/src/tasks/generatePublishTx.ts b/src/tasks/generatePublishTx.ts index 09e20f8b..6ad08eaa 100644 --- a/src/tasks/generatePublishTx.ts +++ b/src/tasks/generatePublishTx.ts @@ -1,6 +1,7 @@ import Listr from "listr"; import { ethers } from "ethers"; import { +<<<<<<< HEAD <<<<<<< HEAD @@ -8,6 +9,10 @@ import { } from "../utils/getEthereumUrl.js"; ======= //Apm, +======= + isValidENSName, + getEthereumProviderUrl, +>>>>>>> refactor APM usage encodeNewVersionCall, encodeNewRepoWithVersionCall } from "../utils/Apm.js"; @@ -22,9 +27,6 @@ import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" import { semverToArray } from "../utils/semverToArray.js"; import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; -import { ApmRepository } from "@dappnode/toolkit"; -import { getEthereumProviderUrl } from "../utils/Apm.js"; - const isZeroAddress = (address: string): boolean => parseInt(address) === 0; /** @@ -50,6 +52,7 @@ export function generatePublishTx({ developerAddress?: string; ethProvider: string; } & CliGlobalOptions): Listr { +<<<<<<< HEAD // Init APM instance <<<<<<< HEAD const ethereumUrl = getEthereumUrl(ethProvider); @@ -61,6 +64,11 @@ export function generatePublishTx({ // Init APM instance const apm2 = new ApmRepository(parsedProvider); >>>>>>> integrate toolkit v1 +======= + + // + const provider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) +>>>>>>> refactor APM usage // Load manifest ##### Verify manifest object const { manifest } = readManifest({ dir }); @@ -78,11 +86,16 @@ export function generatePublishTx({ { title: "Generate transaction", task: async ctx => { +<<<<<<< HEAD <<<<<<< HEAD try { const repository = await apm.getRepoContract(ensName); ======= const repository = await parsedProvider.resolveName(ensName); +======= + isValidENSName(ensName); + const repository = await provider.resolveName(ensName); +>>>>>>> refactor APM usage if (repository) { >>>>>>> integrate toolkit v1 ctx.txData = { @@ -119,8 +132,7 @@ export function generatePublishTx({ `A new Aragon Package Manager Repo for ${ensName} must be created. ======= } else { - //const registry = await apm.getRegistryContract(ensName); - const registry = await parsedProvider.resolveName(ensName.split(".").slice(1).join(".")); + const registry = await provider.resolveName(ensName.split(".").slice(1).join(".")); if (!registry) throw Error( `There must exist a registry for DNP name ${ensName}` diff --git a/src/utils/Apm.ts b/src/utils/Apm.ts index 6630b82e..fafef8a9 100644 --- a/src/utils/Apm.ts +++ b/src/utils/Apm.ts @@ -1,5 +1,4 @@ import { ethers } from "ethers"; -import { arrayToSemver } from "../utils/arrayToSemver.js"; import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" }; import { semverToArray } from "./semverToArray.js"; @@ -17,111 +16,45 @@ export function getEthereumProviderUrl(provider = "dappnode"): string { return provider; } } - -//TODO: refactor this file so it is a utils file and not a class - /** - * @param provider user selected provider. Possible values: - * - null - * - "dappnode" - * - "infura" - * - "http://localhost:8545" - * - "ws://localhost:8546" - * @return apm instance + *checks if the name is a valid ENS name. This means: + * - ENS name must be between 1 and 63 characters. + * - ENS name must contain only lowercase alphanumeric characters(a-z), hyphens(-) and dots(.). + * - Labels must not start or end with a hyphen. + * - Labels must not contain consecutive hyphens. + * - Last label must be ".eth". */ -export class Apm { - provider: ethers.JsonRpcProvider; - - constructor(providerId: string) { - // Initialize ens and web3 instances - // Use http Ids to avoid opened websocket connection - // This application does not need subscriptions and performs very few requests per use - const providerUrl = getEthereumProviderUrl(providerId); +export function isValidENSName(name: string): void { + const invalidMessages: string[] = []; - this.provider = new ethers.JsonRpcProvider(providerUrl); + // Length Check + if (name.length < 3 || name.length > 63) { + invalidMessages.push('Length must be between 3 and 63 characters.'); } - // Ens throws if a node is not found - // - // ens.resolver('admin.dnp.dappnode.eth').addr() - // ==> 0xee66c4765696c922078e8670aa9e6d4f6ffcc455 - // ens.resolver('fake.dnp.dappnode.eth').addr() - // ==> Unhandled rejection Error: ENS name not found - // - // Change behaviour to return null if not found - async resolve(ensDomain: string): Promise { - try { - return await this.provider.resolveName(ensDomain); - } catch (e) { - // This error is particular for ethjs - if (e.message.includes("ENS name not defined")) return null; - else throw e; - } + // Character Check + if (!/^[a-z0-9-.]+$/.test(name)) { + invalidMessages.push('Contains forbidden characters.'); } - /** - * Get the lastest version of an APM repo contract for an ENS domain. - * - * @param ensName: "admin.dnp.dappnode.eth" - * @return latest semver version = '0.1.0' - */ - async getLatestVersion(ensName: string): Promise { - if (!ensName) - throw Error("getLatestVersion first argument ensName must be defined"); - - const repository = await this.getRepoContract(ensName); - if (!repository) { - const registry = await this.getRegistryContract(ensName); - if (registry) - throw Error( - `Error NOREPO: you must first deploy the repo of ${ensName} using the command publish` - ); - else - throw Error( - `Error: there must exist a registry for DNP name ${ensName}` - ); - } - - try { - const res = await repository.getLatest(); - return arrayToSemver(res.semanticVersion); - } catch (e) { - // Rename error for user comprehension - e.message = `Error getting latest version of ${ensName}: ${e.message}`; - throw e; - } + // Hyphen Placement Check + if (name.startsWith("-") || name.endsWith("-") || name.includes("--")) { + invalidMessages.push('Hyphen placement is not allowed.'); } - /** - * Get the APM repo contract for an ENS domain. - * ENS domain: admin.dnp.dappnode.eth - * - * @param ensName: "admin.dnp.dappnode.eth" - * @return contract instance of the Repo "admin.dnp.dappnode.eth" - */ - async getRepoContract(ensName: string): Promise { - const repoAddress = await this.resolve(ensName); - if (!repoAddress) return null; - return new ethers.Contract(repoAddress, repoAbi, this.provider); + const labels = name.split("."); + // Last Label Check + const tld = labels[labels.length - 1]; + if (tld.toLowerCase() !== "eth") { + invalidMessages.push('Last label must be ".eth".'); } - /** - * Get the APM registry contract for an ENS domain. - * It will slice the first subdomain and query the rest as: - * ENS domain: admin.dnp.dappnode.eth - * Registry domain: dnp.dappnode.eth - * - * @param ensName: "admin.dnp.dappnode.eth" - * @return contract instance of the Registry "dnp.dappnode.eth" - */ - async getRegistryContract(ensName: string): Promise { - const repoId = ensName.split(".").slice(1).join("."); - const registryAddress = await this.resolve(repoId); - if (!registryAddress) return null; - return new ethers.Contract(registryAddress, registryAbi, this.provider); + if (invalidMessages.length > 0) { + throw new Error(`Invalid ENS name: ${invalidMessages.join(' ')}`); } } + /** * newVersion( * uint16[3] _newSemanticVersion, diff --git a/src/utils/verifyEthConnection.ts b/src/utils/verifyEthConnection.ts index 07c3205e..63122e40 100644 --- a/src/utils/verifyEthConnection.ts +++ b/src/utils/verifyEthConnection.ts @@ -1,7 +1,13 @@ +<<<<<<< HEAD import { getEthereumUrl } from "./getEthereumUrl.js"; import { CliError } from "../params.js"; import { ethers } from "ethers"; +======= +import { CliError } from "../params.js"; +import {getEthereumProviderUrl} from "./Apm.js"; +import { ethers } from "ethers"; +>>>>>>> refactor APM usage /** * Verify the eth connection outside of the eth library to ensure * capturing HTTP errors @@ -9,13 +15,21 @@ import { ethers } from "ethers"; */ export async function verifyEthConnection(ethProvider: string): Promise { if (!ethProvider) throw Error("No ethProvider provided"); + const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) +<<<<<<< HEAD const provider = new ethers.JsonRpcProvider(getEthereumUrl(ethProvider)); try { const network = await provider.getNetwork(); if (!network) { throw new CliError(`Could not reach ETH provider at ${ethProvider}`); +======= + try { + const isListening = await parsedProvider.send("net_listening", []); + if (isListening === false) { + throw new CliError(`Eth provider ${ethProvider} is not listening`); +>>>>>>> refactor APM usage } } catch (e) { if (ethProvider === "dappnode") { diff --git a/test/utils/Apm.test.ts b/test/utils/Apm.test.ts index 4f57d2b9..c6788786 100644 --- a/test/utils/Apm.test.ts +++ b/test/utils/Apm.test.ts @@ -1,4 +1,3 @@ -import semver from "semver"; import { expect } from "chai"; import { getEthereumProviderUrl } from "../../src/utils/Apm.js"; import { ethers } from "ethers"; @@ -12,8 +11,8 @@ describe("Apm constructor", function () { const registry = await parsedProvider.resolveName(dnpName.split(".").slice(1).join(".")) if (!registry) throw Error("no registry"); - expect(await registry).to.be.a("string", "Contract instance changed"); - expect((await registry).toLowerCase()).to.equal( + expect(registry).to.be.a("string", "Contract instance changed"); + expect((registry).toLowerCase()).to.equal( "0x266BFdb2124A68beB6769dC887BD655f78778923".toLowerCase() ); }); @@ -23,20 +22,9 @@ describe("Apm constructor", function () { const repo = await parsedProvider.resolveName(dnpName) if (!repo) throw Error("no repo"); - expect(await repo).to.be.a("string", "Contract instance changed"); - expect((await repo).toLowerCase()).to.equal( + expect(repo).to.be.a("string", "Contract instance changed"); + expect(repo.toLowerCase()).to.equal( "0xEe66C4765696C922078e8670aA9E6d4F6fFcc455".toLowerCase() ); }); - - // it("Should get the latest of a DNP name", async () => { - // const apm = new Apm("infura"); - // const latestVersion = await apm.getLatestVersion(dnpName); - - // expect(latestVersion).to.be.a("string", "Contract instance changed"); - // expect(Boolean(semver.valid(latestVersion))).to.equal( - // true, - // `Resulting version is not a valid semver: ${semver}` - // ); - // }); }); From 725b47a521c7ed08e528620cee3ca01c8070823c Mon Sep 17 00:00:00 2001 From: Marc Font Date: Tue, 23 May 2023 00:05:07 +0200 Subject: [PATCH 3/6] add version test --- test/utils/Apm.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/utils/Apm.test.ts b/test/utils/Apm.test.ts index c6788786..3f94a90a 100644 --- a/test/utils/Apm.test.ts +++ b/test/utils/Apm.test.ts @@ -1,6 +1,8 @@ +import semver from "semver"; import { expect } from "chai"; import { getEthereumProviderUrl } from "../../src/utils/Apm.js"; import { ethers } from "ethers"; +import { ApmRepository } from "@dappnode/toolkit"; describe("Apm constructor", function () { this.timeout(60_000); @@ -27,4 +29,16 @@ describe("Apm constructor", function () { "0xEe66C4765696C922078e8670aA9E6d4F6fFcc455".toLowerCase() ); }); + + it("Should get the latest of a DNP name", async () => { + const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl("infura")) + const apm = new ApmRepository(parsedProvider) + const latestVersion = await apm.getVersionAndIpfsHash({ dnpName }) + + expect(latestVersion.version).to.be.a("string", "Contract instance changed"); + expect(Boolean(semver.valid(latestVersion.version))).to.equal( + true, + `Resulting version is not a valid semver: ${semver}` + ); + }); }); From a9f6e59f0781b2f95b34742fe8cb30bd78afe245 Mon Sep 17 00:00:00 2001 From: Marc Font Date: Wed, 24 May 2023 13:28:43 +0200 Subject: [PATCH 4/6] rebase to main --- src/tasks/generatePublishTx.ts | 144 +-- src/utils/Apm.ts | 112 -- src/utils/verifyEthConnection.ts | 16 +- src/utils/versions/getNextVersionFromApm.ts | 23 +- test/utils/Apm.test.ts | 9 +- yarn.lock | 1172 +++++-------------- 6 files changed, 338 insertions(+), 1138 deletions(-) delete mode 100644 src/utils/Apm.ts diff --git a/src/tasks/generatePublishTx.ts b/src/tasks/generatePublishTx.ts index 6ad08eaa..ad547254 100644 --- a/src/tasks/generatePublishTx.ts +++ b/src/tasks/generatePublishTx.ts @@ -1,31 +1,14 @@ import Listr from "listr"; import { ethers } from "ethers"; -import { -<<<<<<< HEAD -<<<<<<< HEAD - - - getEthereumUrl -} from "../utils/getEthereumUrl.js"; -======= - //Apm, -======= - isValidENSName, - getEthereumProviderUrl, ->>>>>>> refactor APM usage - encodeNewVersionCall, - encodeNewRepoWithVersionCall -} from "../utils/Apm.js"; ->>>>>>> integrate toolkit v1 import { getPublishTxLink } from "../utils/getLinks.js"; import { addReleaseTx } from "../utils/releaseRecord.js"; import { defaultDir, YargsError } from "../params.js"; import { CliGlobalOptions, ListrContextBuildAndPublish } from "../types.js"; import { readManifest } from "../files/index.js"; -import { ApmRepository } from "@dappnode/toolkit"; +import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" }; import { semverToArray } from "../utils/semverToArray.js"; -import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; +import { getEthereumUrl } from "../utils/getEthereumUrl.js"; const isZeroAddress = (address: string): boolean => parseInt(address) === 0; @@ -52,23 +35,9 @@ export function generatePublishTx({ developerAddress?: string; ethProvider: string; } & CliGlobalOptions): Listr { -<<<<<<< HEAD - // Init APM instance -<<<<<<< HEAD - const ethereumUrl = getEthereumUrl(ethProvider); - const apm = new ApmRepository(ethereumUrl); -======= - //const apm = new Apm(ethProvider); - - const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) - // Init APM instance - const apm2 = new ApmRepository(parsedProvider); ->>>>>>> integrate toolkit v1 -======= // - const provider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) ->>>>>>> refactor APM usage + const provider = new ethers.JsonRpcProvider(getEthereumUrl(ethProvider)) // Load manifest ##### Verify manifest object const { manifest } = readManifest({ dir }); @@ -86,18 +55,9 @@ export function generatePublishTx({ { title: "Generate transaction", task: async ctx => { -<<<<<<< HEAD -<<<<<<< HEAD - try { - const repository = await apm.getRepoContract(ensName); -======= - const repository = await parsedProvider.resolveName(ensName); -======= isValidENSName(ensName); const repository = await provider.resolveName(ensName); ->>>>>>> refactor APM usage if (repository) { ->>>>>>> integrate toolkit v1 ctx.txData = { to: repository, value: 0, @@ -111,29 +71,9 @@ export function generatePublishTx({ currentVersion, releaseMultiHash }; -<<<<<<< HEAD - } catch (e) { - if (e.message.includes("Could not resolve name")) { - try { - const registryAddress = await new ethers.JsonRpcProvider( - ethereumUrl - ).resolveName(ensName.split(".").slice(1).join(".")); - if (!registryAddress) - throw new Error("Registry not found for " + ensName); - - // If repo does not exist, create a new repo and push version - // A developer address must be provided by the option -a or --developer_address. - if ( - !developerAddress || - !ethers.isAddress(developerAddress) || - isZeroAddress(developerAddress) - ) { - throw new YargsError( - `A new Aragon Package Manager Repo for ${ensName} must be created. -======= } else { - const registry = await provider.resolveName(ensName.split(".").slice(1).join(".")); - if (!registry) + const registryAddress = await provider.resolveName(ensName.split(".").slice(1).join(".")); + if (!registryAddress) throw Error( `There must exist a registry for DNP name ${ensName}` ); @@ -147,7 +87,6 @@ export function generatePublishTx({ ) { throw new YargsError( `A new Aragon Package Manager Repo for ${ensName} must be created. ->>>>>>> integrate toolkit v1 You must specify the developer address that will control it with ENV: @@ -158,37 +97,10 @@ with command option: dappnodesdk publish [type] --developer_address 0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B ` -<<<<<<< HEAD - ); - } - - ctx.txData = { - to: registryAddress, - value: 0, - data: encodeNewRepoWithVersionCall({ - name: shortName, - developerAddress, - version: currentVersion, - contractAddress, - contentURI - }), - gasLimit: 1100000, - ensName, - currentVersion, - releaseMultiHash, - developerAddress - }; - } catch (e) { - throw Error( - `There must exist a registry for DNP name ${ensName}` - ); - } - } else throw e; -======= ); } ctx.txData = { - to: registry, + to: registryAddress, value: 0, data: encodeNewRepoWithVersionCall({ name: shortName, @@ -203,7 +115,6 @@ with command option: releaseMultiHash, developerAddress }; ->>>>>>> integrate toolkit v1 } /** @@ -221,9 +132,6 @@ with command option: ); } -// Utils - - /** * newVersion( * uint16[3] _newSemanticVersion, @@ -231,7 +139,7 @@ with command option: * bytes _contentURI * ) */ -export function encodeNewVersionCall({ + export function encodeNewVersionCall({ version, contractAddress, contentURI @@ -279,3 +187,41 @@ export function encodeNewRepoWithVersionCall({ contentURI // bytes _contentURI ]); } +/** + *checks if the name is a valid ENS name. Returns all reasons why the name is not valid if it is not valid. + * - ENS name must be between 1 and 63 characters. + * - ENS name must contain only lowercase alphanumeric characters(a-z), hyphens(-) and dots(.). + * - Labels must not start or end with a hyphen. + * - Labels must not contain consecutive hyphens. + * - Last label must be ".eth". + + */ +export function isValidENSName(name: string): void { + const invalidMessages: string[] = []; + + // Length Check + if (name.length < 3 || name.length > 63) { + invalidMessages.push('Length must be between 3 and 63 characters.'); + } + + // Character Check + if (!/^[a-z0-9-.]+$/.test(name)) { + invalidMessages.push('Contains forbidden characters.'); + } + + // Hyphen Placement Check + if (name.startsWith("-") || name.endsWith("-") || name.includes("--")) { + invalidMessages.push('Hyphen placement is not allowed.'); + } + + const labels = name.split("."); + // Last Label Check + const tld = labels[labels.length - 1]; + if (tld.toLowerCase() !== "eth") { + invalidMessages.push('Last label must be ".eth".'); + } + + if (invalidMessages.length > 0) { + throw new Error(`Invalid ENS name: ${invalidMessages.join(' ')}`); + } +} \ No newline at end of file diff --git a/src/utils/Apm.ts b/src/utils/Apm.ts deleted file mode 100644 index fafef8a9..00000000 --- a/src/utils/Apm.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { ethers } from "ethers"; -import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; -import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" }; -import { semverToArray } from "./semverToArray.js"; - -export function getEthereumProviderUrl(provider = "dappnode"): string { - if (provider === "dappnode") { - return "http://fullnode.dappnode:8545"; - } else if (provider === "remote") { - return "https://web3.dappnode.net"; - } else if (provider === "infura") { - // Make sure to change this common Infura token - // if it stops working or you prefer to use your own - return "https://mainnet.infura.io/v3/bb15bacfcdbe45819caede241dcf8b0d"; - } else { - return provider; - } -} -/** - *checks if the name is a valid ENS name. This means: - * - ENS name must be between 1 and 63 characters. - * - ENS name must contain only lowercase alphanumeric characters(a-z), hyphens(-) and dots(.). - * - Labels must not start or end with a hyphen. - * - Labels must not contain consecutive hyphens. - * - Last label must be ".eth". - */ -export function isValidENSName(name: string): void { - const invalidMessages: string[] = []; - - // Length Check - if (name.length < 3 || name.length > 63) { - invalidMessages.push('Length must be between 3 and 63 characters.'); - } - - // Character Check - if (!/^[a-z0-9-.]+$/.test(name)) { - invalidMessages.push('Contains forbidden characters.'); - } - - // Hyphen Placement Check - if (name.startsWith("-") || name.endsWith("-") || name.includes("--")) { - invalidMessages.push('Hyphen placement is not allowed.'); - } - - const labels = name.split("."); - // Last Label Check - const tld = labels[labels.length - 1]; - if (tld.toLowerCase() !== "eth") { - invalidMessages.push('Last label must be ".eth".'); - } - - if (invalidMessages.length > 0) { - throw new Error(`Invalid ENS name: ${invalidMessages.join(' ')}`); - } -} - - -/** - * newVersion( - * uint16[3] _newSemanticVersion, - * address _contractAddress, - * bytes _contentURI - * ) - */ -export function encodeNewVersionCall({ - version, - contractAddress, - contentURI -}: { - version: string; - contractAddress: string; - contentURI: string; -}): string { - const repo = ethers.Interface.from(repoAbi) - return repo.encodeFunctionData("newVersion", [ - semverToArray(version), // uint16[3] _newSemanticVersion - contractAddress, // address _contractAddress - contentURI // bytes _contentURI - ]); -} - -/** - * newRepoWithVersion( - * string _name, - * address _dev, - * uint16[3] _initialSemanticVersion, - * address _contractAddress, - * bytes _contentURI - * ) - */ -export function encodeNewRepoWithVersionCall({ - name, - developerAddress, - version, - contractAddress, - contentURI -}: { - name: string; - developerAddress: string; - version: string; - contractAddress: string; - contentURI: string; -}): string { - const registry = ethers.Interface.from(registryAbi) - return registry.encodeFunctionData("newRepoWithVersion", [ - name, // string _name - developerAddress, // address _dev - semverToArray(version), // uint16[3] _initialSemanticVersion - contractAddress, // address _contractAddress - contentURI // bytes _contentURI - ]); -} diff --git a/src/utils/verifyEthConnection.ts b/src/utils/verifyEthConnection.ts index 63122e40..a8c4bb31 100644 --- a/src/utils/verifyEthConnection.ts +++ b/src/utils/verifyEthConnection.ts @@ -1,13 +1,7 @@ -<<<<<<< HEAD import { getEthereumUrl } from "./getEthereumUrl.js"; import { CliError } from "../params.js"; import { ethers } from "ethers"; -======= -import { CliError } from "../params.js"; -import {getEthereumProviderUrl} from "./Apm.js"; -import { ethers } from "ethers"; ->>>>>>> refactor APM usage /** * Verify the eth connection outside of the eth library to ensure * capturing HTTP errors @@ -15,21 +9,13 @@ import { ethers } from "ethers"; */ export async function verifyEthConnection(ethProvider: string): Promise { if (!ethProvider) throw Error("No ethProvider provided"); - const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) -<<<<<<< HEAD const provider = new ethers.JsonRpcProvider(getEthereumUrl(ethProvider)); try { const network = await provider.getNetwork(); if (!network) { throw new CliError(`Could not reach ETH provider at ${ethProvider}`); -======= - try { - const isListening = await parsedProvider.send("net_listening", []); - if (isListening === false) { - throw new CliError(`Eth provider ${ethProvider} is not listening`); ->>>>>>> refactor APM usage } } catch (e) { if (ethProvider === "dappnode") { @@ -42,4 +28,4 @@ export async function verifyEthConnection(ethProvider: string): Promise { throw new CliError(`Could not reach ETH provider at ${ethProvider}`); } } -} +} \ No newline at end of file diff --git a/src/utils/versions/getNextVersionFromApm.ts b/src/utils/versions/getNextVersionFromApm.ts index d8cd18b8..cc18758e 100644 --- a/src/utils/versions/getNextVersionFromApm.ts +++ b/src/utils/versions/getNextVersionFromApm.ts @@ -1,18 +1,10 @@ import semver from "semver"; -<<<<<<< HEAD import { getEthereumUrl } from "../getEthereumUrl.js"; -======= ->>>>>>> integrate toolkit v1 import { checkSemverType } from "../checkSemverType.js"; import { ReleaseType } from "../../types.js"; import { readManifest } from "../../files/index.js"; import { ApmRepository } from "@dappnode/toolkit"; -<<<<<<< HEAD -======= -import { ethers } from "ethers"; -import { getEthereumProviderUrl } from "../Apm.js"; ->>>>>>> integrate toolkit v1 export async function getNextVersionFromApm({ type, ethProvider, @@ -25,32 +17,19 @@ export async function getNextVersionFromApm({ // Check variables checkSemverType(type); - // ethProvider is a simple "dappnode" or "infura" string - // we need to convert it to a valid url - const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl(ethProvider)) - // Init APM instance -<<<<<<< HEAD const apm = new ApmRepository(getEthereumUrl(ethProvider)); -======= - const apm = new ApmRepository(parsedProvider); ->>>>>>> integrate toolkit v1 // Load manifest const { manifest } = readManifest({ dir }); const ensName = manifest.name.toLowerCase(); // Fetch the latest version from APM -<<<<<<< HEAD console.log("ensName: ", ensName); const { version: currentVersion } = await apm.getVersionAndIpfsHash({ dnpName: ensName }); -======= - const currentVersion = (await apm.getVersionAndIpfsHash({ dnpName: ensName })).version; - console.log(`Current version2: ${currentVersion}`) ->>>>>>> integrate toolkit v1 // Increase the version and log it const nextVersion = semver.inc(currentVersion, type); if (!nextVersion) @@ -59,4 +38,4 @@ export async function getNextVersionFromApm({ ); return nextVersion; -} +} \ No newline at end of file diff --git a/test/utils/Apm.test.ts b/test/utils/Apm.test.ts index 3f94a90a..99f6f295 100644 --- a/test/utils/Apm.test.ts +++ b/test/utils/Apm.test.ts @@ -1,6 +1,6 @@ import semver from "semver"; import { expect } from "chai"; -import { getEthereumProviderUrl } from "../../src/utils/Apm.js"; +import { getEthereumUrl } from "../../src/utils/getEthereumUrl"; import { ethers } from "ethers"; import { ApmRepository } from "@dappnode/toolkit"; describe("Apm constructor", function () { @@ -9,7 +9,7 @@ describe("Apm constructor", function () { const dnpName = "admin.dnp.dappnode.eth"; it("Should get the contract the registry contract of a DNP name", async () => { - const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl("infura")) + const parsedProvider = new ethers.JsonRpcProvider(getEthereumUrl("infura")) const registry = await parsedProvider.resolveName(dnpName.split(".").slice(1).join(".")) if (!registry) throw Error("no registry"); @@ -20,7 +20,7 @@ describe("Apm constructor", function () { }); it("Should get the contract the repo contract of a DNP name", async () => { - const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl("infura")) + const parsedProvider = new ethers.JsonRpcProvider(getEthereumUrl("infura")) const repo = await parsedProvider.resolveName(dnpName) if (!repo) throw Error("no repo"); @@ -31,8 +31,7 @@ describe("Apm constructor", function () { }); it("Should get the latest of a DNP name", async () => { - const parsedProvider = new ethers.JsonRpcProvider(getEthereumProviderUrl("infura")) - const apm = new ApmRepository(parsedProvider) + const apm = new ApmRepository(getEthereumUrl("infura")) const latestVersion = await apm.getVersionAndIpfsHash({ dnpName }) expect(latestVersion.version).to.be.a("string", "Contract instance changed"); diff --git a/yarn.lock b/yarn.lock index db031862..91ee8364 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,11 +4,7 @@ "@adraffy/ens-normalize@1.9.0": version "1.9.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.0.tgz#223572538f6bea336750039bb43a4016dcc8182d" -======= - resolved "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ== "@babel/code-frame@^7.0.0": @@ -39,20 +35,12 @@ "@chainsafe/is-ip@^2.0.1": version "2.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@chainsafe/is-ip/-/is-ip-2.0.1.tgz#62cb285669d91f88fd9fa285048dde3882f0993b" -======= - resolved "https://registry.npmjs.org/@chainsafe/is-ip/-/is-ip-2.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-nqSJ8u2a1Rv9FYbyI8qpDhTYujaKEyLknNrTejLYoSWmdeg+2WB7R6BZqPZYfrJzDxVi3rl6ZQuoaEvpKRZWgQ== "@chainsafe/netmask@^2.0.0": version "2.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@chainsafe/netmask/-/netmask-2.0.0.tgz#0d4a75f47919f65011da4327a3845c9661f1038a" -======= - resolved "https://registry.npmjs.org/@chainsafe/netmask/-/netmask-2.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-I3Z+6SWUoaljh3TBzCnCxjlUyN8tA+NAk5L6m9IxvCf1BENQTePzPMis97CoN/iMW1St3WN+AWCCRp+TTBRiDg== dependencies: "@chainsafe/is-ip" "^2.0.1" @@ -65,16 +53,15 @@ "@jridgewell/trace-mapping" "0.3.9" "@dappnode/schemas@^0.1.6": - version "0.1.7" - resolved "https://registry.npmjs.org/@dappnode/schemas/-/schemas-0.1.7.tgz" - integrity sha512-jd72x7Qf4IuWdgaeqlajgGaZ7vSAmMZrEg9mwe5NcEgrBfgIE4sWA8ewnIswV+1BCtWsewkEpvAA4WdKIfNyjQ== + version "0.1.6" + resolved "https://registry.yarnpkg.com/@dappnode/schemas/-/schemas-0.1.6.tgz#d299cc6b7a4aec663688dcbb3ea7ebc1f4963aef" + integrity sha512-deKlp0PBEszpYmZFSevMFs/RqJnxuTxkxWAVTNKs2vvHbcCP50kWw/agl0pHCIJPqg8S83rq5H88lpL3vtP5Rw== dependencies: "@dappnode/types" "^0.1.9" ajv "^8.12.0" ajv-errors "^3.0.0" semver "^7.5.0" -<<<<<<< HEAD "@dappnode/toolkit@^0.1.18": version "0.1.18" resolved "https://registry.yarnpkg.com/@dappnode/toolkit/-/toolkit-0.1.18.tgz#8918b8be9c16aff88c613b4a606fa34f702c3ad6" @@ -93,31 +80,10 @@ yaml "^2.2.2" "@dappnode/types@^0.1.12": -======= -"@dappnode/toolkit@0.1.12": ->>>>>>> integrate toolkit v1 version "0.1.12" - resolved "https://registry.npmjs.org/@dappnode/toolkit/-/toolkit-0.1.12.tgz" - integrity sha512-+cGpyCaOFeT9Vpd66BO+MGJy9oniENZG+spn3IclwFDyXQON4TY/RyjgbXrZ7dOBFGIs251X2KKysIv5EVjj/g== - dependencies: - "@dappnode/types" "^0.1.12" - "@ipld/car" "^5.1.1" - esm "^3.2.25" - ethers "^6.3.0" - graphql-request "^6.0.0" - ipfs-http-client "^60.0.0" - ipfs-unixfs-exporter "^13.1.5" - is-ipfs "^8.0.1" - multiformats "^11.0.2" - semver "^7.5.0" - yaml "^2.2.2" - -"@dappnode/types@^0.1.12", "@dappnode/types@^0.1.9": - version "0.1.12" - resolved "https://registry.npmjs.org/@dappnode/types/-/types-0.1.12.tgz" + resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.12.tgz#b7d804d7bd511af2f189ca36f9e3f04952d310ee" integrity sha512-k35wyNqZ5Cm2aY+W+2QPzHR9vq00dv2gVENhmhU4yUOjSnK69tihilnTD4fmWOCs9hPEXsJOh3GDzUCUUbrzwg== -<<<<<<< HEAD "@dappnode/types@^0.1.9": version "0.1.9" resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.9.tgz#23d13181ab077b33e23b929bd32cc6b2b618ec4a" @@ -126,20 +92,11 @@ "@graphql-typed-document-node/core@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" -======= -"@graphql-typed-document-node/core@^3.2.0": - version "3.2.0" - resolved "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== "@ipld/car@^5.1.1": version "5.1.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@ipld/car/-/car-5.1.1.tgz#14a26dc97c4783ade491ac811f61885259b9d75e" -======= - resolved "https://registry.npmjs.org/@ipld/car/-/car-5.1.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-HoFTUqUJL9cPGhC9qRmHCvamfIsj1JllQSQ/Xu9/KN/VNJp8To9Ms4qiZPEMOwcrNFclfYqrahjGYbf4KL/d9A== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -148,40 +105,24 @@ varint "^6.0.0" "@ipld/dag-cbor@^9.0.0": -<<<<<<< HEAD version "9.0.1" resolved "https://registry.yarnpkg.com/@ipld/dag-cbor/-/dag-cbor-9.0.1.tgz#fc7c76af284b74b3a67b003a768d2c4758841272" integrity sha512-tImDka4akO7cuD24+nRLOU1kYXoai3VZ1cMeWCFUzwhKrRXyOLfVd9RZGI6aTsE/PYvHmkFobKvTeK9NPVtajA== -======= - version "9.0.0" - resolved "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.0.tgz" - integrity sha512-zdsiSiYDEOIDW7mmWOYWC9gukjXO+F8wqxz/LfN7iSwTfIyipC8+UQrCbPupFMRb/33XQTZk8yl3My8vUQBRoA== ->>>>>>> integrate toolkit v1 dependencies: cborg "^1.10.0" multiformats "^11.0.0" "@ipld/dag-json@^10.0.0": -<<<<<<< HEAD version "10.1.0" resolved "https://registry.yarnpkg.com/@ipld/dag-json/-/dag-json-10.1.0.tgz#9cad1628d9ef6df0d732d2d468adb53987d1111d" integrity sha512-2rSvzDyGxx1NC24IsqKFTSXzAfUBlniZQRT15PEN+i177KEBsCXPfxuN/DweGIfmj3YceNyR8XOJT47pRZu7Cg== -======= - version "10.0.1" - resolved "https://registry.npmjs.org/@ipld/dag-json/-/dag-json-10.0.1.tgz" - integrity sha512-XE1Eqw3eNVrSfOhtqCM/gwCxEgYFBzkDlkwhEeMmMvhd0rLBfSyVzXbahZSlv97tiTPEIx5rt41gcFAda3W8zg== ->>>>>>> integrate toolkit v1 dependencies: cborg "^1.10.0" multiformats "^11.0.0" "@ipld/dag-pb@^4.0.0": version "4.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@ipld/dag-pb/-/dag-pb-4.0.3.tgz#2fedd3804ad46ea6206be9302bfed5d3a0af26b3" -======= - resolved "https://registry.npmjs.org/@ipld/dag-pb/-/dag-pb-4.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-bOe+Z2ZJs9pmP/aIUBYMTdXq0i5z1x71qXeOIIhZvnKFLuzTIbbW0u5b7OfTGzUEbSv1dkUZBIXa7G/+OA8dnA== dependencies: multiformats "^11.0.0" @@ -206,11 +147,7 @@ "@libp2p/interface-connection@^4.0.0": version "4.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-connection/-/interface-connection-4.0.0.tgz#fcc830ca891820fac89a4c6bd4fcc2df4874f49b" -======= - resolved "https://registry.npmjs.org/@libp2p/interface-connection/-/interface-connection-4.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-6xx/NmEc84HX7QmsjSC3hHredQYjHv4Dkf4G27adAPf+qN+vnPxmQ7gaTnk243a0++DOFTbZ2gKX/15G2B6SRg== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -221,11 +158,7 @@ "@libp2p/interface-keychain@^2.0.0": version "2.0.5" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-keychain/-/interface-keychain-2.0.5.tgz#6ce104f38cf07ad72c9dfbe471a689f4ea4b4687" -======= - resolved "https://registry.npmjs.org/@libp2p/interface-keychain/-/interface-keychain-2.0.5.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-mb7QNgn9fIvC7CaJCi06GJ+a6DN6RVT9TmEi0NmedZGATeCArPeWWG7r7IfxNVXb9cVOOE1RzV1swK0ZxEJF9Q== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -233,22 +166,14 @@ "@libp2p/interface-peer-id@^2.0.0": version "2.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-peer-id/-/interface-peer-id-2.0.2.tgz#6302e70b6fc17c451bc3daa11447d059357bcc32" -======= - resolved "https://registry.npmjs.org/@libp2p/interface-peer-id/-/interface-peer-id-2.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-9pZp9zhTDoVwzRmp0Wtxw0Yfa//Yc0GqBCJi3EznBDE6HGIAVvppR91wSh2knt/0eYg0AQj7Y35VSesUTzMCUg== dependencies: multiformats "^11.0.0" "@libp2p/interface-peer-info@^1.0.2": version "1.0.10" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-peer-info/-/interface-peer-info-1.0.10.tgz#566026de95a0817b9e853c982b313541b7960c0b" -======= - resolved "https://registry.npmjs.org/@libp2p/interface-peer-info/-/interface-peer-info-1.0.10.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-HQlo8NwQjMyamCHJrnILEZz+YwEOXCB2sIIw3slIrhVUYeYlTaia1R6d9umaAeLHa255Zmdm4qGH8rJLRqhCcg== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -256,11 +181,7 @@ "@libp2p/interface-pubsub@^3.0.0": version "3.0.7" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interface-pubsub/-/interface-pubsub-3.0.7.tgz#cc1c7c47c883daddd2b84d83d719b3826943be3b" -======= - resolved "https://registry.npmjs.org/@libp2p/interface-pubsub/-/interface-pubsub-3.0.7.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-+c74EVUBTfw2sx1GE/z/IjsYO6dhur+ukF0knAppeZsRQ1Kgg6K5R3eECtT28fC6dBWLjFpAvW/7QGfiDAL4RA== dependencies: "@libp2p/interface-connection" "^4.0.0" @@ -271,20 +192,12 @@ "@libp2p/interfaces@^3.0.0", "@libp2p/interfaces@^3.2.0", "@libp2p/interfaces@^3.3.1": version "3.3.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/interfaces/-/interfaces-3.3.2.tgz#5d8079be845b0960939b5b18880e785a4714465a" -======= - resolved "https://registry.npmjs.org/@libp2p/interfaces/-/interfaces-3.3.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-p/M7plbrxLzuQchvNwww1Was7ZeGE2NaOFulMaZBYIihU8z3fhaV+a033OqnC/0NTX/yhfdNOG7znhYq3XoR/g== "@libp2p/logger@^2.0.0": version "2.0.7" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/logger/-/logger-2.0.7.tgz#9a3996242b4a9edb8a9d825c8accaf62f617c5c6" -======= - resolved "https://registry.npmjs.org/@libp2p/logger/-/logger-2.0.7.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Zp9C9lMNGfVFTMVc7NvxuxMvIE6gyxDapQc/TqZH02IuIDl1JpZyCgNILr0APd8wcUxwvwRXYNf3kQ0Lmz7tuQ== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -294,11 +207,7 @@ "@libp2p/peer-id@^2.0.0": version "2.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@libp2p/peer-id/-/peer-id-2.0.3.tgz#7299d74eae7b2526123d941bdb2d08462704c79a" -======= - resolved "https://registry.npmjs.org/@libp2p/peer-id/-/peer-id-2.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-eZX+5ByUAzh8DrfjCan0spZGpvF7SxEBz4tOPoBMBCuKJJLr+8EokBO/5E3ceIw04f5+lAcD3CO3bccuKomp3Q== dependencies: "@libp2p/interface-peer-id" "^2.0.0" @@ -308,35 +217,21 @@ "@multiformats/mafmt@^11.0.3": version "11.1.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@multiformats/mafmt/-/mafmt-11.1.2.tgz#c03ef4022c795b7f230b136f2f974fc263eac4f1" -======= - resolved "https://registry.npmjs.org/@multiformats/mafmt/-/mafmt-11.1.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-3n1o5eLU7WzTAPLuz3AodV7Iql6NWf7Ws8fqVaGT7o5nDDabUPYGBm2cZuh3OrqmwyCY61LrNUIsjzivU6UdpQ== dependencies: "@multiformats/multiaddr" "^12.0.0" "@multiformats/multiaddr-to-uri@^9.0.1": -<<<<<<< HEAD version "9.0.7" resolved "https://registry.yarnpkg.com/@multiformats/multiaddr-to-uri/-/multiaddr-to-uri-9.0.7.tgz#44881352b1d9d98b53451982cd433f0f45ad7e24" integrity sha512-i3ldtPMN6XJt+MCi34hOl0wGuGEHfWWMw6lmNag5BpckPwPTf9XGOOFMmh7ed/uO3Vjah/g173iOe61HTQVoBA== -======= - version "9.0.4" - resolved "https://registry.npmjs.org/@multiformats/multiaddr-to-uri/-/multiaddr-to-uri-9.0.4.tgz" - integrity sha512-y2XDH/h6U1hnkFNyt3NeJhUv+9PiXJlzC6RZOOzK2OY3JgM6l6RrPrOJ1Tc2Sn4Aw6b2aUKY4C6nN4h6j9/+Vg== ->>>>>>> integrate toolkit v1 dependencies: "@multiformats/multiaddr" "^12.0.0" "@multiformats/multiaddr@^11.0.0": version "11.6.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-11.6.1.tgz#ec46984a298e715e27a398434c087856db5f3185" -======= - resolved "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-11.6.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-doST0+aB7/3dGK9+U5y3mtF3jq85KGbke1QiH0KE1F5mGQ9y56mFebTeu2D9FNOm+OT6UHb8Ss8vbSnpGjeLNw== dependencies: "@chainsafe/is-ip" "^2.0.1" @@ -348,11 +243,7 @@ "@multiformats/multiaddr@^12.0.0": version "12.1.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-12.1.3.tgz#aff5aa61ec19c5320f0b756e88c3bbaac8d1c7af" -======= - resolved "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-12.1.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-rNcS3njkkSwuGF4x58L47jGH5kBXBfJPNsWnrt0gujhNYn6ReDt1je7vEU5/ddrVj0TStgxw+Hm+TkYDK0b60w== dependencies: "@chainsafe/is-ip" "^2.0.1" @@ -364,35 +255,21 @@ varint "^6.0.0" "@multiformats/murmur3@^2.0.0": -<<<<<<< HEAD version "2.1.4" resolved "https://registry.yarnpkg.com/@multiformats/murmur3/-/murmur3-2.1.4.tgz#e93cce560c381f8326b2271facf2ea04f6fd8a66" integrity sha512-qHHmZKD1Dy6PDi35pAowE1pQtnH7gwaJpUE/Ju+cOYVdWD4T8VVtKAumGCxwd31JKyNC0W1IzAaHQz1dnXXvBw== -======= - version "2.1.3" - resolved "https://registry.npmjs.org/@multiformats/murmur3/-/murmur3-2.1.3.tgz" - integrity sha512-YvLK1IrLnRckPsvXhOkZjaIGNonsEdD1dL3NPSaLilV/WjVYeBgnNZXTUsaPzFXGrIFM7motx+yCmmqzXO6gtQ== ->>>>>>> integrate toolkit v1 dependencies: multiformats "^11.0.0" murmurhash3js-revisited "^3.0.0" "@noble/hashes@1.1.2": version "1.1.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" -======= - resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== "@noble/secp256k1@1.7.1": version "1.7.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c" -======= - resolved "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw== "@octokit/auth-token@^2.4.4": @@ -402,7 +279,7 @@ dependencies: "@octokit/types" "^6.0.0" -"@octokit/core@^3.2.3", "@octokit/core@>=2", "@octokit/core@>=3": +"@octokit/core@^3.2.3": version "3.2.4" resolved "https://registry.npmjs.org/@octokit/core/-/core-3.2.4.tgz" integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg== @@ -490,14 +367,7 @@ "@octokit/plugin-request-log" "^1.0.2" "@octokit/plugin-rest-endpoint-methods" "4.4.1" -"@octokit/types@^5.0.0": - version "5.0.1" - resolved "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz" - integrity sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA== - dependencies: - "@types/node" ">= 8" - -"@octokit/types@^5.0.1": +"@octokit/types@^5.0.0", "@octokit/types@^5.0.1": version "5.0.1" resolved "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz" integrity sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA== @@ -514,47 +384,27 @@ "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" -======= - resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== "@protobufjs/base64@^1.1.2": version "1.1.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" -======= - resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== "@protobufjs/codegen@^2.0.4": version "2.0.4" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" -======= - resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== "@protobufjs/eventemitter@^1.1.0": version "1.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" -======= - resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== "@protobufjs/fetch@^1.1.0": version "1.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" -======= - resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== dependencies: "@protobufjs/aspromise" "^1.1.1" @@ -562,47 +412,27 @@ "@protobufjs/float@^1.0.2": version "1.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" -======= - resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== "@protobufjs/inquire@^1.1.0": version "1.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" -======= - resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== "@protobufjs/path@^1.1.2": version "1.1.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" -======= - resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== "@protobufjs/pool@^1.1.0": version "1.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" -======= - resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== "@protobufjs/utf8@^1.1.0": version "1.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" -======= - resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== "@samverschueren/stream-to-observable@^0.3.0": @@ -770,12 +600,12 @@ "@types/mime-types@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz" - integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= sha512-8LDSKVdJxwfJXZAcHRwFDxozsTCo3UmIpDjN1cOnYMTr0h4ivK9I+IdEMdtjnssFm0y66vbnpd21mAgGZ1oGAQ== + integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= -"@types/minimatch@*", "@types/minimatch@^3.0.4": - version "3.0.5" - resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/minimatch@^3.0.4": version "3.0.5" @@ -787,7 +617,7 @@ resolved "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz" integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== -"@types/node@*", "@types/node@^18.0.0", "@types/node@^18.11.18", "@types/node@^18.15.11", "@types/node@>= 8", "@types/node@>=13.7.0": +"@types/node@*", "@types/node@>= 8", "@types/node@^18.11.18", "@types/node@^18.15.11": version "18.15.11" resolved "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz" integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== @@ -913,7 +743,7 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^3.0.0", "@typescript-eslint/parser@^3.5.0": +"@typescript-eslint/parser@^3.5.0": version "3.5.0" resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.5.0.tgz" integrity sha512-sU07VbYB70WZHtgOjH/qfAp1+OwaWgrvD1Km1VXqRpcVxt971PMTU7gJtlrCje0M+Sdz7xKAbtiyIu+Y6QdnVA== @@ -960,7 +790,7 @@ acorn-walk@^8.1.1: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -"acorn@^6.0.0 || ^7.0.0", acorn@^7.2.0: +acorn@^7.2.0: version "7.3.1" resolved "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== @@ -972,11 +802,7 @@ acorn@^8.4.1: aes-js@4.0.0-beta.3: version "4.0.0-beta.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.3.tgz#da2253f0ff03a0b3a9e445c8cbdf78e7fda7d48c" -======= - resolved "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-/xJX0/VTPcbc5xQE2VUP91y1xN8q/rDfhEzLm+vLc3hYvb5+qHCnpJRuFcrKn63zumK/sCwYYzhG8HP78JYSTA== ajv-errors@^3.0.0: @@ -984,20 +810,10 @@ ajv-errors@^3.0.0: resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz" integrity sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ== -ajv@^6.10.0: - version "6.12.2" - resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^6.10.2: - version "6.12.2" - resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== +ajv@^6.10.0, ajv@^6.10.2: + version "6.12.6" + resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -1014,9 +830,9 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1, ajv@^8.12.0: +ajv@^8.12.0: version "8.12.0" - resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" @@ -1024,16 +840,16 @@ ajv@^8.0.1, ajv@^8.12.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ansi-colors@^3.2.1: - version "3.2.4" - resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== - ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== +ansi-colors@^3.2.1: + version "3.2.4" + resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz" + integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== + ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz" @@ -1042,24 +858,19 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= sha512-wFUFA5bg5dviipbQQ32yOQhl6gcJaJXiHE7dvR8VYPG97+J/GNC5FKGepKdEDUFeXRzDxPF1X/Btc8L+v7oqIQ== + version "3.0.1" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz" + integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "4.1.1" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz" + integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== -ansi-regex@^5.0.1: +ansi-regex@^5.0.0, ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -1067,7 +878,7 @@ ansi-regex@^5.0.1: ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" @@ -1098,11 +909,7 @@ any-observable@^0.3.0: any-signal@^3.0.0: version "3.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-3.0.1.tgz#49cae34368187a3472e31de28fb5cb1430caa9a6" -======= - resolved "https://registry.npmjs.org/any-signal/-/any-signal-3.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg== anymatch@~3.1.2: @@ -1137,10 +944,10 @@ asn1@^0.2.4, asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" -assert-plus@^1.0.0, assert-plus@1.0.0: +assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= assertion-error@^1.1.0: version "1.1.0" @@ -1162,12 +969,12 @@ async-retry@^1.2.3: asynckit@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: version "1.10.0" @@ -1177,9 +984,9 @@ aws4@^1.8.0: balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg== + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64-js@^1.0.2, base64-js@^1.3.1: +base64-js@^1.0.2: version "1.3.1" resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== @@ -1192,7 +999,7 @@ base64-js@^1.3.1: bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= dependencies: tweetnacl "^0.14.3" @@ -1217,11 +1024,7 @@ bl@^4.0.1: blob-to-it@^2.0.0: version "2.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/blob-to-it/-/blob-to-it-2.0.3.tgz#ea76abbe7a158d77683a0b155de5ed8dd4c703f4" -======= - resolved "https://registry.npmjs.org/blob-to-it/-/blob-to-it-2.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Z3CAVpJMwB9B/lp+hOGEyD+6Rx690v1EBj37Wf/eF7ltXZEu2ppd2H9w/FFNGlx36PW5tsoynTNt2HwkgNV9hw== dependencies: browser-readablestream-to-it "^2.0.0" @@ -1250,20 +1053,12 @@ braces@~3.0.2: browser-readablestream-to-it@^1.0.0: version "1.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz#ac3e406c7ee6cdf0a502dd55db33bab97f7fba76" -======= - resolved "https://registry.npmjs.org/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw== browser-readablestream-to-it@^2.0.0: version "2.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-2.0.3.tgz#8c08c7c0d98aa1b4098fd19cb147a6028b188470" -======= - resolved "https://registry.npmjs.org/browser-readablestream-to-it/-/browser-readablestream-to-it-2.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-kFLXH4FWJNZbbIEeqZMCYfVPQx6glf3e1mReo3bB3xbn1o/YWbHsYpxIGo2rfNsmPqv7I+Fg4qObvtvbAq4DbA== browser-stdout@1.3.1: @@ -1284,46 +1079,18 @@ buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" -<<<<<<< HEAD buffer@^6.0.1, buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" -======= -buffer@^6.0.1: - version "6.0.3" - resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== dependencies: base64-js "^1.3.1" ieee754 "^1.2.1" -<<<<<<< HEAD buildcheck@~0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238" integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A== -======= -buffer@^6.0.3: - version "6.0.3" - resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz" - integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.2.1" - -buildcheck@0.0.5: - version "0.0.5" - resolved "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.5.tgz" - integrity sha512-jYWpRy8eedl/JZqkOeq0X0bNcaK04hXKhIi4gYsDKZUJWRjJJWViYfsMXO0BJQ40zSLcdLoa+iqe48Kz2PtQag== - -busboy@^1.6.0: - version "1.6.0" - resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz" - integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== - dependencies: - streamsearch "^1.1.0" ->>>>>>> integrate toolkit v1 busboy@^1.6.0: version "1.6.0" @@ -1366,12 +1133,7 @@ camelcase@^6.0.0: caseless@~0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== - -cborg@^1.10.0, cborg@^1.9.0: - version "1.10.1" - resolved "https://registry.npmjs.org/cborg/-/cborg-1.10.1.tgz" - integrity sha512-et6Qm8MOUY2kCWa5GKk2MlBVoPjHv0hQBmlzI/Z7+5V3VJCeIkGehIB3vWknNsm2kOkAIs6wEKJFJo8luWQQ/w== + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= cborg@^1.10.0, cborg@^1.9.0: version "1.10.2" @@ -1391,21 +1153,10 @@ chai@^4.3.7: pathval "^1.1.1" type-detect "^4.0.5" -chalk@^1.0.0: - version "1.1.3" - resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -1446,7 +1197,7 @@ chardet@^0.7.0: check-error@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== + integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= chokidar@3.5.3: version "3.5.3" @@ -1471,7 +1222,7 @@ chownr@^1.1.1: cli-cursor@^2.0.0, cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= dependencies: restore-cursor "^2.0.0" @@ -1486,7 +1237,7 @@ cli-progress@^3.8.2: cli-truncate@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz" - integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg== + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= dependencies: slice-ansi "0.0.4" string-width "^1.0.1" @@ -1524,7 +1275,7 @@ clone-response@^1.0.2: code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= color-convert@^1.9.0: version "1.9.3" @@ -1540,16 +1291,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - colors@^1.1.2: version "1.4.0" resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz" @@ -1565,19 +1316,19 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: concat-map@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= core-util-is@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= cpu-features@~0.0.4: - version "0.0.6" - resolved "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.6.tgz" - integrity sha512-Rj33pk//oVNh25YjsBaKtOkXNW7IARYxejWJosJkXqVPpbK+FrdpThPk6f4m3d+CEh2qMlkGx/SFt2Y1XSWN6g== + version "0.0.7" + resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.7.tgz#81ba93e1d0a729fd25132a54c3ff689c37b542f7" + integrity sha512-fjzFmsUKKCrC9GrM1eQTvQx18e+kjXFzjRLvJPNEDjk31+bJ6ZiV6uchv/hzbzXVIgbWdrEyyX1IFKwse65+8w== dependencies: - buildcheck "0.0.5" + buildcheck "~0.0.6" nan "^2.17.0" create-require@^1.1.0: @@ -1587,11 +1338,7 @@ create-require@^1.1.0: cross-fetch@^3.1.5: version "3.1.6" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz#bae05aa31a4da760969756318feeee6e70f15d6c" -======= - resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g== dependencies: node-fetch "^2.6.11" @@ -1618,11 +1365,7 @@ cross-spawn@^7.0.2: dag-jose@^4.0.0: version "4.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/dag-jose/-/dag-jose-4.0.0.tgz#4e65f62af58dd5203b2b094eb52142ffe0cdec1d" -======= - resolved "https://registry.npmjs.org/dag-jose/-/dag-jose-4.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-tw595L3UYoOUT9dSJPbBEG/qpRpw24kRZxa5SLRnlnr+g5L7O8oEs1d3W5TiVA1oJZbthVsf0Vi3zFN66qcEBA== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -1631,7 +1374,7 @@ dag-jose@^4.0.0: dashdash@^1.12.0: version "1.14.1" resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= dependencies: assert-plus "^1.0.0" @@ -1640,17 +1383,20 @@ date-fns@^1.27.2: resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== -<<<<<<< HEAD debug@4.3.4, debug@^4.3.1, debug@^4.3.3: -======= -debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@4.3.4: ->>>>>>> integrate toolkit v1 version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" +debug@^4.0.1, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + decamelize@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz" @@ -1673,7 +1419,7 @@ deep-eql@^4.1.2: deep-is@^0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw== + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= defer-to-connect@^2.0.0: version "2.0.1" @@ -1683,32 +1429,22 @@ defer-to-connect@^2.0.0: delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - diff@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== -dns-over-http-resolver@^2.1.0: - version "2.1.1" - resolved "https://registry.npmjs.org/dns-over-http-resolver/-/dns-over-http-resolver-2.1.1.tgz" - integrity sha512-Lm/eXB7yAQLJ5WxlBGwYfBY7utduXPZykcSmcG6K7ozM0wrZFvxZavhT6PqI0kd/5CUTfev/RrEFQqyU4CGPew== - dependencies: - debug "^4.3.1" - native-fetch "^4.0.2" - receptacle "^1.3.2" - undici "^5.12.0" +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== dns-over-http-resolver@^2.1.0: version "2.1.1" @@ -1759,18 +1495,14 @@ duplexer3@^0.1.4: ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" electron-fetch@^1.7.2: version "1.9.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.9.1.tgz#e28bfe78d467de3f2dec884b1d72b8b05322f30f" -======= - resolved "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.9.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-M9qw6oUILGVrcENMSRRefE1MbHPIz0h79EKIeJWK9v563aT9Qkh8aEHPO1H5vi970wPirNY+jO9OpFoLiMsMGA== dependencies: encoding "^0.1.13" @@ -1778,11 +1510,7 @@ electron-fetch@^1.7.2: elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz" -<<<<<<< HEAD integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -======= - integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ== ->>>>>>> integrate toolkit v1 emoji-regex@^7.0.1: version "7.0.3" @@ -1794,15 +1522,9 @@ emoji-regex@^8.0.0: resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -<<<<<<< HEAD encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" -======= -encoding@^0.1.0, encoding@^0.1.13: - version "0.1.13" - resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: iconv-lite "^0.6.2" @@ -1823,11 +1545,7 @@ enquirer@^2.3.5: err-code@^3.0.1: version "3.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" -======= - resolved "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== escalade@^3.1.1: @@ -1835,16 +1553,16 @@ escalade@^3.1.1: resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - escape-string-regexp@4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + eslint-scope@^5.0.0, eslint-scope@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz" @@ -1865,7 +1583,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@*, "eslint@^5.0.0 || ^6.0.0 || ^7.0.0", eslint@^7.3.1: +eslint@^7.3.1: version "7.3.1" resolved "https://registry.npmjs.org/eslint/-/eslint-7.3.1.tgz" integrity sha512-cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA== @@ -1909,11 +1627,7 @@ eslint@*, "eslint@^5.0.0 || ^6.0.0 || ^7.0.0", eslint@^7.3.1: esm@^3.2.25: version "3.2.25" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" -======= - resolved "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== espree@^7.1.0: @@ -1959,15 +1673,9 @@ esutils@^2.0.2: resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -<<<<<<< HEAD ethers@6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.3.0.tgz#c61efaafa2bd9a4d9f0c799d932ef3b5cd4bd37d" -======= -ethers@^6.3.0: - version "6.3.0" - resolved "https://registry.npmjs.org/ethers/-/ethers-6.3.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-CKFYvTne1YT4S1glTiu7TgGsj0t6c6GAD7evrIk8zbeUb6nK8dcUPAiAWM8uDX/1NmRTvLM9+1Vnn49hwKtEzw== dependencies: "@adraffy/ens-normalize" "1.9.0" @@ -1979,11 +1687,7 @@ ethers@^6.3.0: eventemitter3@^4.0.7: version "4.0.7" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" -======= - resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== execa@^1.0.0: @@ -2013,10 +1717,15 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extsprintf@^1.2.0, extsprintf@1.3.0: +extsprintf@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= fast-deep-equal@^3.1.1: version "3.1.3" @@ -2025,11 +1734,7 @@ fast-deep-equal@^3.1.1: fast-fifo@^1.0.0: version "1.2.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.2.0.tgz#2ee038da2468e8623066dee96958b0c1763aa55a" -======= - resolved "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.2.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-NcvQXt7Cky1cNau15FWy64IjuO8X0JijhTBBrJj1YlxlDfRkJXNaK9RFUjwpfDPzMdv7wB38jr53l9tkNLxnWg== fast-json-stable-stringify@^2.0.0: @@ -2040,7 +1745,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= figlet@^1.2.3: version "1.4.0" @@ -2050,7 +1755,7 @@ figlet@^1.2.3: figures@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" - integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ== + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= dependencies: escape-string-regexp "^1.0.5" object-assign "^4.1.0" @@ -2058,7 +1763,7 @@ figures@^1.7.0: figures@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= dependencies: escape-string-regexp "^1.0.5" @@ -2106,7 +1811,7 @@ flatted@^2.0.0: forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= form-data@^2.5.0: version "2.5.1" @@ -2143,12 +1848,17 @@ fs-constants@^1.0.0: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= get-caller-file@^2.0.5: version "2.0.5" @@ -2158,12 +1868,7 @@ get-caller-file@^2.0.5: get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== - -get-iterator@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/get-iterator/-/get-iterator-1.0.2.tgz" - integrity sha512-v+dm9bNVfOYsY1OrhaCrmyOcYoSeVvbt+hHZ0Au+T+p1y+0Uyj9aMaGIeUTT6xdpRbWzDeYKvfOslPhggQMcsg== + integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= get-iterator@^1.0.2: version "1.0.2" @@ -2187,7 +1892,7 @@ get-stream@^5.0.0, get-stream@^5.1.0: getpass@^0.1.1: version "0.1.7" resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= dependencies: assert-plus "^1.0.0" @@ -2198,7 +1903,7 @@ glob-parent@^5.0.0, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob@^7.1.3, glob@^7.1.6, glob@7.2.0: +glob@7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -2210,6 +1915,18 @@ glob@^7.1.3, glob@^7.1.6, glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.3, glob@^7.1.6: + version "7.1.6" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + globals@^12.1.0: version "12.4.0" resolved "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz" @@ -2239,37 +1956,21 @@ got@^10.5.5: type-fest "^0.10.0" graphql-request@^6.0.0: -<<<<<<< HEAD version "6.1.0" resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f" integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw== -======= - version "6.0.0" - resolved "https://registry.npmjs.org/graphql-request/-/graphql-request-6.0.0.tgz" - integrity sha512-2BmHTuglonjZvmNVw6ZzCfFlW/qkIPds0f+Qdi/Lvjsl3whJg2uvHmSvHnLWhUTEw6zcxPYAHiZoPvSVKOZ7Jw== ->>>>>>> integrate toolkit v1 dependencies: "@graphql-typed-document-node/core" "^3.2.0" cross-fetch "^3.1.5" -<<<<<<< HEAD graphql@^16.6.0: version "16.6.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb" -======= -"graphql@^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "graphql@14 - 16": - version "16.6.0" - resolved "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw== hamt-sharding@^3.0.0: version "3.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/hamt-sharding/-/hamt-sharding-3.0.2.tgz#a3fba1e4e6b58469388a0e1458768c78c0cd95f6" -======= - resolved "https://registry.npmjs.org/hamt-sharding/-/hamt-sharding-3.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-f0DzBD2tSmLFdFsLAvOflIBqFPjerbA7BfmwO8mVho/5hXwgyyYhv+ijIzidQf/DpDX3bRjAQvhGoBFj+DBvPw== dependencies: sparse-array "^1.3.1" @@ -2278,7 +1979,7 @@ hamt-sharding@^3.0.0: har-schema@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.3: version "5.1.3" @@ -2291,14 +1992,14 @@ har-validator@~5.1.3: has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= dependencies: ansi-regex "^2.0.0" has-flag@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" @@ -2318,7 +2019,7 @@ http-cache-semantics@^4.0.0: http-signature@~1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" @@ -2333,26 +2034,15 @@ iconv-lite@^0.4.24: iconv-lite@^0.6.2: version "0.6.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" -======= - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -<<<<<<< HEAD ieee754@^1.1.4: version "1.1.13" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -======= -ieee754@^1.1.4, ieee754@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ->>>>>>> integrate toolkit v1 ieee754@^1.2.1: version "1.2.1" @@ -2382,22 +2072,22 @@ import-fresh@^3.0.0: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= indent-string@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ== + integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= inflight@^1.0.4: version "1.0.6" resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" wrappy "1" -inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@2: +inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2423,11 +2113,7 @@ inquirer@^6.2.1: interface-blockstore@^5.0.0: version "5.2.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-blockstore/-/interface-blockstore-5.2.0.tgz#150216529cf56bf43c2aebd3070f4351d1169ef4" -======= - resolved "https://registry.npmjs.org/interface-blockstore/-/interface-blockstore-5.2.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-lLW6fNP3PkBKghK9BsLuV8VMquL/o2lInomrTUizY/p4n7vxzVn3YT7qGTHywZzCcMIBeGMneDApGe21TNkg+g== dependencies: interface-store "^5.0.0" @@ -2435,11 +2121,7 @@ interface-blockstore@^5.0.0: interface-datastore@^7.0.0: version "7.0.4" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-7.0.4.tgz#f09ae4e2896f57f876d5d742a59e982fb3f42891" -======= - resolved "https://registry.npmjs.org/interface-datastore/-/interface-datastore-7.0.4.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Q8LZS/jfFFHz6XyZazLTAc078SSCoa27ZPBOfobWdpDiFO7FqPA2yskitUJIhaCgxNK8C+/lMBUTBNfVIDvLiw== dependencies: interface-store "^3.0.0" @@ -2448,11 +2130,7 @@ interface-datastore@^7.0.0: interface-datastore@^8.0.0: version "8.2.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-8.2.0.tgz#70076985ac17dcdb35b33c2b0f957480ce6489e1" -======= - resolved "https://registry.npmjs.org/interface-datastore/-/interface-datastore-8.2.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-rDMAcpCGxWMubRk2YQuSEHl11bc0xcZeBZzfLvqhoZJdByUWeo7YDJUdgyRKgD6liGXVYirtDkFU9nyn9xl2hg== dependencies: interface-store "^5.0.0" @@ -2461,29 +2139,17 @@ interface-datastore@^8.0.0: interface-store@^3.0.0: version "3.0.4" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-store/-/interface-store-3.0.4.tgz#670d95ef45f3b7061d154c3cbfaf39a538167ad7" -======= - resolved "https://registry.npmjs.org/interface-store/-/interface-store-3.0.4.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-OjHUuGXbH4eXSBx1TF1tTySvjLldPLzRSYYXJwrEQI+XfH5JWYZofr0gVMV4F8XTwC+4V7jomDYkvGRmDSRKqQ== interface-store@^5.0.0: version "5.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/interface-store/-/interface-store-5.1.0.tgz#1735cead844fe452d62c307fafbaaa1d261e6ff3" -======= - resolved "https://registry.npmjs.org/interface-store/-/interface-store-5.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-mjUwX3XSoreoxCS3sXS3pSRsGnUjl9T06KBqt/T7AgE9Sgp4diH64ZyURJKnj2T5WmCvTbC0Dm+mwQV5hfLSBQ== ipfs-core-types@^0.14.0: version "0.14.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.14.0.tgz#a301d534f5261aad2254da393cb09f9cd36b6742" -======= - resolved "https://registry.npmjs.org/ipfs-core-types/-/ipfs-core-types-0.14.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-qO1xVO3n5m7scTXXtMz8hDTLdwXInnwqadIDQpXC446BIlaYyRWUvLcFQ2bOjQql9/CPNTaPHzjzr5Y1XxqpJw== dependencies: "@ipld/dag-pb" "^4.0.0" @@ -2499,11 +2165,7 @@ ipfs-core-types@^0.14.0: ipfs-core-utils@^0.18.0: version "0.18.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.18.0.tgz#c528c6cfb231d3a1a0d5420d0a3506615d26f4b4" -======= - resolved "https://registry.npmjs.org/ipfs-core-utils/-/ipfs-core-utils-0.18.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-7N/KfsOPGJu9mwN8EQwrW9HXgS5RNM3WUyjIMWk49KlpYmsXectXuC9i6npI1vn1W/oUaIOZt3lHx37jecnepw== dependencies: "@libp2p/logger" "^2.0.0" @@ -2529,11 +2191,7 @@ ipfs-core-utils@^0.18.0: ipfs-http-client@^60.0.0: version "60.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-60.0.0.tgz#429ca98544ee1fde79f96ee055d95a789384247c" -======= - resolved "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-60.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-d6Rqc1UP5nWhp7j0PumK80CA5LvbTvskro+qGw7hgWvbfQ0rX/5ddig7ELvVYJbJM4YBxCJSaSHDEOGoSpzzKg== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -2558,11 +2216,7 @@ ipfs-http-client@^60.0.0: ipfs-unixfs-exporter@^13.1.5: version "13.1.5" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-13.1.5.tgz#345ab63c10671af926630447c40059f8d8107533" -======= - resolved "https://registry.npmjs.org/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-13.1.5.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-O5aMawsHoe4DaYk5FFil2EPrNOaU3pkHC6qUR5JMnW7es93W3b/RjJoO7AyDL1rpb+M3K0oRu86Yc5wLNQQ8jg== dependencies: "@ipld/dag-cbor" "^9.0.0" @@ -2585,11 +2239,7 @@ ipfs-unixfs-exporter@^13.1.5: ipfs-unixfs@^11.0.0: version "11.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-11.0.1.tgz#7232e888b15a785aef7a5bd4dedf1861401f3b63" -======= - resolved "https://registry.npmjs.org/ipfs-unixfs/-/ipfs-unixfs-11.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-SD9dqn14bfgMfkPstsR/2Av3zCzYMj2ntQJab4HZucgX4nNV6K7guZh4Hf3kiL8ONff1Ogft1ekFU083DIKEdQ== dependencies: err-code "^3.0.1" @@ -2598,11 +2248,7 @@ ipfs-unixfs@^11.0.0: ipfs-unixfs@^9.0.0: version "9.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-9.0.1.tgz#d06e688e07ef4ce08d610337ba2fe8c143c386e7" -======= - resolved "https://registry.npmjs.org/ipfs-unixfs/-/ipfs-unixfs-9.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-jh2CbXyxID+v3jLml9CqMwjdSS9ZRnsGfQGGPOfem0/hT/L48xUeTPvh7qLFWkZcIMhZtG+fnS1teei8x5uGBg== dependencies: err-code "^3.0.1" @@ -2610,11 +2256,7 @@ ipfs-unixfs@^9.0.0: ipfs-utils@^9.0.13: version "9.0.14" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-9.0.14.tgz#24f5fda1f4567685eb32bca2543d518f95fd8704" -======= - resolved "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-9.0.14.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-zIaiEGX18QATxgaS0/EOQNoo33W0islREABAcxXE8n7y2MGAlB+hdsxXn4J0hGZge8IqVQhW8sWIb+oJz2yEvg== dependencies: any-signal "^3.0.0" @@ -2643,52 +2285,44 @@ is-binary-path@~2.1.0: is-electron@^2.2.0: version "2.2.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.2.tgz#3778902a2044d76de98036f5dc58089ac4d80bb9" -======= - resolved "https://registry.npmjs.org/is-electron/-/is-electron-2.2.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg== is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= dependencies: number-is-nan "^1.0.0" is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" -is-ipfs@^8.0.1: - version "8.0.1" - resolved "https://registry.npmjs.org/is-ipfs/-/is-ipfs-8.0.1.tgz" - integrity sha512-hoBSElmPath3aDdtaOpVZsuCh2SXTqvLML+H75S7iDgKdqNmENJ6tsRucP1HLfpqEyZ/uIlj/+ZBxIC/F8B5Eg== +is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: - "@multiformats/mafmt" "^11.0.3" - "@multiformats/multiaddr" "^11.0.0" - iso-url "^1.1.3" - multiformats "^11.0.0" - uint8arrays "^4.0.2" + is-extglob "^2.1.1" is-ipfs@^8.0.1: version "8.0.1" @@ -2736,12 +2370,12 @@ is-promise@^2.1.0: is-stream@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-unicode-supported@^0.1.0: version "0.1.0" @@ -2751,12 +2385,7 @@ is-unicode-supported@^0.1.0: isexe@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -iso-url@^1.1.3, iso-url@^1.1.5: - version "1.2.1" - resolved "https://registry.npmjs.org/iso-url/-/iso-url-1.2.1.tgz" - integrity sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng== + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= iso-url@^1.1.3, iso-url@^1.1.5: version "1.2.1" @@ -2766,26 +2395,8 @@ iso-url@^1.1.3, iso-url@^1.1.5: isstream@~0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== - -it-all@^1.0.4: - version "1.0.6" - resolved "https://registry.npmjs.org/it-all/-/it-all-1.0.6.tgz" - integrity sha512-3cmCc6Heqe3uWi3CVM/k51fa/XbMFpQVzFoDsV0IZNHSQDyAXl3c4MjHkFX5kF3922OGj7Myv1nSEUgRtcuM1A== - -it-all@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/it-all/-/it-all-2.0.1.tgz" - integrity sha512-9UuJcCRZsboz+HBQTNOau80Dw+ryGaHYFP/cPYzFBJBFcfDathMYnhHk4t52en9+fcyDGPTdLB+lFc1wzQIroA== - -it-filter@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/it-filter/-/it-filter-3.0.2.tgz" - integrity sha512-Hhzp5anX7tmKOBqTPasBYTPlq7l4Xk4lMBfLB5GfKZnL9WCc6pr8M9Waud4nHh3s9neb4xwDWk7KQsEapgWyJw== - dependencies: - it-peekable "^3.0.0" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -<<<<<<< HEAD it-all@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/it-all/-/it-all-1.0.6.tgz#852557355367606295c4c3b7eff0136f07749335" @@ -2806,20 +2417,11 @@ it-filter@^3.0.2: it-first@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/it-first/-/it-first-2.0.1.tgz#75d66b254c385ae3a1906def060a69006a437cef" -======= -it-first@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/it-first/-/it-first-2.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-noC1oEQcWZZMUwq7VWxHNLML43dM+5bviZpfmkxkXlvBe60z7AFRqpZSga9uQBo792jKv9otnn1IjA4zwgNARw== it-glob@^1.0.1: version "1.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-glob/-/it-glob-1.0.2.tgz#bab9b04d6aaac42884502f3a0bfee84c7a29e15e" -======= - resolved "https://registry.npmjs.org/it-glob/-/it-glob-1.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Ch2Dzhw4URfB9L/0ZHyY+uqOnKvBNeS/SMcRiPmJfpHiM0TsUZn+GkpcZxAoF3dJVdPm/PuIk3A4wlV7SUo23Q== dependencies: "@types/minimatch" "^3.0.4" @@ -2827,89 +2429,53 @@ it-glob@^1.0.1: it-last@^2.0.0: version "2.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-last/-/it-last-2.0.1.tgz#a6f3253459cb77e917aeada3b2c4ae9f3e66c64b" -======= - resolved "https://registry.npmjs.org/it-last/-/it-last-2.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-uVMedYW0wa2Cx0TAmcOCLbfuLLII7+vyURmhKa8Zovpd+aBTMsmINtsta2n364wJ5qsEDBH+akY1sUtAkaYBlg== it-last@^3.0.2: version "3.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-last/-/it-last-3.0.2.tgz#b012d88d2cc0d1e01eedf2b5114cefd94cef6c9b" -======= - resolved "https://registry.npmjs.org/it-last/-/it-last-3.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-aWoA5moJ7XSKe7+YuutBKhySroDDWkfjpo+UknekPh1M5YYdK4YNSPDarR+7o/NqRwzazwgzCi2UZzU0oqsprQ== it-map@^2.0.0: version "2.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-map/-/it-map-2.0.1.tgz#d5251fd6b222d6ee39293d406a3f8fce54fb9220" -======= - resolved "https://registry.npmjs.org/it-map/-/it-map-2.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-a2GcYDHiAh/eSU628xlvB56LA98luXZnniH2GlD0IdBzf15shEq9rBeb0Rg3o1SWtNILUAwqmQxEXcewGCdvmQ== it-map@^3.0.3: version "3.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-map/-/it-map-3.0.3.tgz#42be39fc68dc9b0d70cfd8ac4b8311d4b5cd7f22" -======= - resolved "https://registry.npmjs.org/it-map/-/it-map-3.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Yf89GJYeYUZb2NZzWkvFHm3IBXlxro74i2vGRmpf8BYau3BhlaS37ieDenJEdYzkTGJhL/EbM1jPPw/KGVVVIw== dependencies: it-peekable "^3.0.0" it-merge@^3.0.0: version "3.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-merge/-/it-merge-3.0.1.tgz#20cc293593586e5afcbfed8ba88a94def5ccfcfa" -======= - resolved "https://registry.npmjs.org/it-merge/-/it-merge-3.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-I6hjU1ABO+k3xY1H6JtCSDXvUME88pxIXSgKeT4WI5rPYbQzpr98ldacVuG95WbjaJxKl6Qot6lUdxduLBQPHA== dependencies: it-pushable "^3.1.0" it-parallel@^3.0.0: version "3.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-parallel/-/it-parallel-3.0.3.tgz#b02f1d6459418c7253ecf13e367111560a616491" -======= - resolved "https://registry.npmjs.org/it-parallel/-/it-parallel-3.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Q5KmdvERHCOLDcgKqrzQ+yiMCdG6H9h7ZL3Zjx/Tx9xhZy8txSKoy+EiCgWZFs0rfYvxJhk6UkOpKLzJ1zM9ZA== dependencies: p-defer "^4.0.0" it-peekable@^2.0.0: version "2.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-peekable/-/it-peekable-2.0.1.tgz#1e118610473aa511efc70f3bb7a7066178728dd3" -======= - resolved "https://registry.npmjs.org/it-peekable/-/it-peekable-2.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-fJ/YTU9rHRhGJOM2hhQKKEfRM6uKB9r4yGGFLBHqp72ACC8Yi6+7/FhuBAMG8cpN6mLoj9auVX7ZJ3ul6qFpTA== it-peekable@^3.0.0: version "3.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-peekable/-/it-peekable-3.0.1.tgz#530953f735359c10503e961c059602f8a366a1a5" -======= - resolved "https://registry.npmjs.org/it-peekable/-/it-peekable-3.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-5zBfkf6e+YoxxWV0YDXMwdQKnc7eeTX6xo3WYPm/8dIoctIiDnddInRWOW+83W/8/76sbnpWqqsO4gSyXandeQ== it-pipe@^3.0.1: version "3.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-pipe/-/it-pipe-3.0.1.tgz#b25720df82f4c558a8532602b5fbc37bbe4e7ba5" -======= - resolved "https://registry.npmjs.org/it-pipe/-/it-pipe-3.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-sIoNrQl1qSRg2seYSBH/3QxWhJFn9PKYvOf/bHdtCBF0bnghey44VyASsWzn5dAx0DCDDABq1hZIuzKmtBZmKA== dependencies: it-merge "^3.0.0" @@ -2918,38 +2484,22 @@ it-pipe@^3.0.1: it-pushable@^3.0.0, it-pushable@^3.1.0, it-pushable@^3.1.2: version "3.1.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-pushable/-/it-pushable-3.1.3.tgz#b6f4a1e0236502f12b5661b40468b629799baf0e" -======= - resolved "https://registry.npmjs.org/it-pushable/-/it-pushable-3.1.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-f50iQ85HISS6DaWCyrqf9QJ6G/kQtKIMf9xZkgZgyOvxEQDfn8OfYcLXXquCqgoLboxQtAW1ZFZyFIAsLHDtJw== it-stream-types@^1.0.4: version "1.0.5" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-stream-types/-/it-stream-types-1.0.5.tgz#9c72e6adefdea9dac69d0a28fbea783deebd508d" -======= - resolved "https://registry.npmjs.org/it-stream-types/-/it-stream-types-1.0.5.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-I88Ka1nHgfX62e5mi5LLL+oueqz7Ltg0bUdtsUKDe9SoUqbQPf2Mp5kxDTe9pNhHQGs4pvYPAINwuZ1HAt42TA== it-stream-types@^2.0.1: version "2.0.1" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-stream-types/-/it-stream-types-2.0.1.tgz#69cb4d7e79e707b8257a8997e02751ccb6c3af32" -======= - resolved "https://registry.npmjs.org/it-stream-types/-/it-stream-types-2.0.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-6DmOs5r7ERDbvS4q8yLKENcj6Yecr7QQTqWApbZdfAUTEC947d+PEha7PCqhm//9oxaLYL7TWRekwhoXl2s6fg== it-to-stream@^1.0.0: version "1.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/it-to-stream/-/it-to-stream-1.0.0.tgz#6c47f91d5b5df28bda9334c52782ef8e97fe3a4a" -======= - resolved "https://registry.npmjs.org/it-to-stream/-/it-to-stream-1.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-pLULMZMAB/+vbdvbZtebC0nWBTbG581lk6w8P7DfIIIKUfa8FbY7Oi0FxZcFPbxvISs7A9E+cMpLDBc1XhpAOA== dependencies: buffer "^6.0.3" @@ -2964,6 +2514,13 @@ js-tokens@^4.0.0: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +js-yaml@4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + js-yaml@^3.12.1, js-yaml@^3.13.1: version "3.14.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz" @@ -2972,17 +2529,10 @@ js-yaml@^3.12.1, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= json-buffer@3.0.1: version "3.0.1" @@ -2999,29 +2549,29 @@ json-schema-traverse@^1.0.0: resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= sha512-a3xHnILGMtk+hDOqNwHzF6e2fNbiMrXZvxKQiEv2MlgQP+pjIOzqAmKYD2mDpXYE/44M7g+n9p2bKkYWDUcXCQ== +json-schema@0.4.0: + version "0.4.0" + resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz" + integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= sha512-4Dj8Rf+fQ+/Pn7C5qeEX02op1WfOss3PKTE9Nsop3Dx+6UPxlm1dr/og7o2cRa5hNN07CACr4NFzRLtj/rjWog== + version "1.4.2" + resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz" + integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== dependencies: assert-plus "1.0.0" extsprintf "1.3.0" - json-schema "0.2.3" + json-schema "0.4.0" verror "1.10.0" keyv@^4.0.0: @@ -3042,7 +2592,7 @@ levn@^0.4.1: listr-silent-renderer@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz" - integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA== + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= listr-update-renderer@^0.5.0: version "0.5.0" @@ -3068,7 +2618,7 @@ listr-verbose-renderer@^0.5.0: date-fns "^1.27.2" figures "^2.0.0" -listr@^0.14.2, listr@^0.14.3: +listr@^0.14.3: version "0.14.3" resolved "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz" integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== @@ -3096,16 +2646,9 @@ lodash-es@^4.17.21: integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15: - version "4.17.19" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== - -log-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz" - integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ== - dependencies: - chalk "^1.0.0" + version "4.17.21" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@4.1.0: version "4.1.0" @@ -3115,10 +2658,17 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= + dependencies: + chalk "^1.0.0" + log-update@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz" - integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg== + integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= dependencies: ansi-escapes "^3.0.0" cli-cursor "^2.0.0" @@ -3126,11 +2676,7 @@ log-update@^2.3.0: long@^5.0.0: version "5.2.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" -======= - resolved "https://registry.npmjs.org/long/-/long-5.2.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== loupe@^2.3.1: @@ -3147,7 +2693,7 @@ lowercase-keys@^2.0.0: lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: yallist "^4.0.0" @@ -3164,11 +2710,7 @@ make-error@^1.1.1: merge-options@^3.0.4: version "3.0.4" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" -======= - resolved "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== dependencies: is-plain-obj "^2.1.0" @@ -3200,16 +2742,6 @@ mimic-response@^2.0.0, mimic-response@^2.1.0: resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== -<<<<<<< HEAD -======= -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - ->>>>>>> integrate toolkit v1 minimatch@5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" @@ -3217,10 +2749,17 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.8" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== mkdirp-classic@^0.5.2: version "0.5.3" @@ -3262,11 +2801,11 @@ mocha@^10.2.0: yargs-unparser "2.0.0" moment@^2.27.0: - version "2.27.0" - resolved "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz" - integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== + version "2.29.4" + resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== -ms@^2.1.1, ms@2.1.2: +ms@2.1.2, ms@^2.1.1: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== @@ -3278,38 +2817,29 @@ ms@2.1.3: multiformats@^11.0.0, multiformats@^11.0.2: version "11.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-11.0.2.tgz#b14735efc42cd8581e73895e66bebb9752151b60" -======= - resolved "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg== murmurhash3js-revisited@^3.0.0: version "3.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz#6bd36e25de8f73394222adc6e41fa3fac08a5869" -======= - resolved "https://registry.npmjs.org/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-/sF3ee6zvScXMb1XFJ8gDsSnY+X8PbOyjIuBhtgis10W2Jx4ZjIhikUCIF9c4gpJxVnQIsPAFrSwTCuAjicP6g== mute-stream@0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= nan@^2.16.0, nan@^2.17.0: version "2.17.0" - resolved "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== -nanoid@^3.1.20, nanoid@3.3.3: +nanoid@3.3.3: version "3.3.3" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== -<<<<<<< HEAD nanoid@^3.1.20: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" @@ -3318,45 +2848,32 @@ nanoid@^3.1.20: nanoid@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-4.0.2.tgz#140b3c5003959adbebf521c170f282c5e7f9fb9e" -======= -nanoid@^4.0.0: - version "4.0.2" - resolved "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw== native-fetch@^3.0.0: version "3.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-3.0.0.tgz#06ccdd70e79e171c365c75117959cf4fe14a09bb" -======= - resolved "https://registry.npmjs.org/native-fetch/-/native-fetch-3.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw== native-fetch@^4.0.2: version "4.0.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-4.0.2.tgz#75c8a44c5f3bb021713e5e24f2846750883e49af" -======= - resolved "https://registry.npmjs.org/native-fetch/-/native-fetch-4.0.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-4QcVlKFtv2EYVS5MBgsGX5+NWKtbDbIECdUXDBGDMAZXq3Jkv9zf+y8iS7Ub8fEdga3GpYeazp9gauNqXHJOCg== natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= nice-try@^1.0.4: version "1.0.5" resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch@*, node-fetch@^2.6.1, node-fetch@^2.6.11, node-fetch@^2.6.8: - version "2.6.11" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz" - integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== +node-fetch@^2.6.1: + version "2.6.9" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz" + integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== dependencies: whatwg-url "^5.0.0" @@ -3380,14 +2897,14 @@ normalize-url@^6.0.1: npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw== + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= dependencies: path-key "^2.0.0" number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= oauth-sign@~0.9.0: version "0.9.0" @@ -3397,19 +2914,19 @@ oauth-sign@~0.9.0: object-assign@^4.1.0: version "4.1.1" resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" onetime@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= dependencies: mimic-fn "^1.0.0" @@ -3436,7 +2953,7 @@ os-name@^3.1.0: os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= p-cancelable@^2.0.0: version "2.1.1" @@ -3445,20 +2962,12 @@ p-cancelable@^2.0.0: p-defer@^3.0.0: version "3.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" -======= - resolved "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== p-defer@^4.0.0: version "4.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-4.0.0.tgz#8082770aeeb10eb6b408abe91866738741ddd5d2" -======= - resolved "https://registry.npmjs.org/p-defer/-/p-defer-4.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Vb3QRvQ0Y5XnF40ZUWW7JfLogicVh/EnA5gBIvKDJoYpeI82+1E3AlB9yOcKFS0AhHrWVnAQO39fbR0G99IVEQ== p-event@^4.0.0: @@ -3470,11 +2979,7 @@ p-event@^4.0.0: p-fifo@^1.0.0: version "1.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-fifo/-/p-fifo-1.0.0.tgz#e29d5cf17c239ba87f51dde98c1d26a9cfe20a63" -======= - resolved "https://registry.npmjs.org/p-fifo/-/p-fifo-1.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-IjoCxXW48tqdtDFz6fqo5q1UfFVjjVZe8TC1QRflvNUJtNfCUhxOUw6MOVZhDPjqhSzc26xKdugsO17gmzd5+A== dependencies: fast-fifo "^1.0.0" @@ -3483,7 +2988,7 @@ p-fifo@^1.0.0: p-finally@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= p-limit@^3.0.2: version "3.1.0" @@ -3506,11 +3011,7 @@ p-map@^2.0.0: p-queue@^7.3.0: version "7.3.4" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-7.3.4.tgz#7ef7d89b6c1a0563596d98adbc9dc404e9ed4a84" -======= - resolved "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg== dependencies: eventemitter3 "^4.0.7" @@ -3525,11 +3026,7 @@ p-timeout@^3.1.0: p-timeout@^5.0.2: version "5.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b" -======= - resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew== parent-module@^1.0.0: @@ -3541,11 +3038,7 @@ parent-module@^1.0.0: parse-duration@^1.0.0: version "1.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.0.3.tgz#b6681f5edcc2689643b34c09ea63f86f58a35814" -======= - resolved "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-o6NAh12na5VvR6nFejkU0gpQ8jmOY9Y9sTU2ke3L3G/d/3z8jqmbBbeyBGHU73P4JLXfc7tJARygIK3WGIkloA== path-exists@^4.0.0: @@ -3556,17 +3049,12 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^2.0.1: +path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= path-key@^3.1.0: version "3.1.1" @@ -3581,7 +3069,7 @@ pathval@^1.1.1: performance-now@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" @@ -3600,11 +3088,7 @@ prettier@^2.1.2: progress-events@^1.0.0: version "1.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/progress-events/-/progress-events-1.0.0.tgz#34f5e8fdb5dae3561837b22672d1e02277bb2109" -======= - resolved "https://registry.npmjs.org/progress-events/-/progress-events-1.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-zIB6QDrSbPfRg+33FZalluFIowkbV5Xh1xSuetjG+rlC5he6u2dc6VQJ0TbMdlN3R1RHdpOqxEFMKTnQ+itUwA== progress@^2.0.0: @@ -3614,11 +3098,7 @@ progress@^2.0.0: protobufjs@^7.0.0: version "7.2.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2" -======= - resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg== dependencies: "@protobufjs/aspromise" "^1.1.2" @@ -3636,11 +3116,7 @@ protobufjs@^7.0.0: protons-runtime@^5.0.0: version "5.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/protons-runtime/-/protons-runtime-5.0.0.tgz#1eb3c78637ff02cc90bb030e3bff6f0402109c25" -======= - resolved "https://registry.npmjs.org/protons-runtime/-/protons-runtime-5.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-QqjGnPGkpvbzq0dITzhG9DVK10rRIHf7nePcU2QQVVpFGuYbwrOWnvGSvei1GcceAzB9syTz6vHzvTPmGRR0PA== dependencies: protobufjs "^7.0.0" @@ -3665,9 +3141,9 @@ punycode@^2.1.0, punycode@^2.1.1: integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== qs@~6.5.2: - version "6.5.2" - resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== queue@6.0.1: version "6.0.1" @@ -3685,7 +3161,6 @@ randombytes@^2.1.0: react-native-fetch-api@^3.0.0: version "3.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz#81e1bb6562c292521bc4eca52fe1097f4c1ebab5" integrity sha512-g2rtqPjdroaboDKTsJCTlcmtw54E25OjyaunUP0anOZn4Fuo2IKs8BVfe02zVggA/UysbmfSnRJIqtNkAgggNA== dependencies: @@ -3695,18 +3170,12 @@ readable-stream@^3.1.1, readable-stream@^3.4.0: version "3.6.0" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== -======= - resolved "https://registry.npmjs.org/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz" - integrity sha512-g2rtqPjdroaboDKTsJCTlcmtw54E25OjyaunUP0anOZn4Fuo2IKs8BVfe02zVggA/UysbmfSnRJIqtNkAgggNA== ->>>>>>> integrate toolkit v1 dependencies: - p-defer "^3.0.0" + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" -<<<<<<< HEAD readable-stream@^3.5.0, readable-stream@^3.6.0: -======= -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: ->>>>>>> integrate toolkit v1 version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -3724,11 +3193,7 @@ readdirp@~3.6.0: receptacle@^1.3.2: version "1.3.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/receptacle/-/receptacle-1.3.2.tgz#a7994c7efafc7a01d0e2041839dab6c4951360d2" -======= - resolved "https://registry.npmjs.org/receptacle/-/receptacle-1.3.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-HrsFvqZZheusncQRiEE7GatOAETrARKV/lnfYicIm8lbvp/JQOdADOfhjBd2DajvoszEyxSM6RlAAIZgEoeu/A== dependencies: ms "^2.1.1" @@ -3767,7 +3232,7 @@ request@^2.88.2: require-directory@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= require-from-string@^2.0.2: version "2.0.2" @@ -3789,31 +3254,20 @@ responselike@^2.0.0: restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= dependencies: onetime "^2.0.0" signal-exit "^3.0.2" retimer@^3.0.0: version "3.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/retimer/-/retimer-3.0.0.tgz#98b751b1feaf1af13eb0228f8ea68b8f9da530df" -======= - resolved "https://registry.npmjs.org/retimer/-/retimer-3.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-WKE0j11Pa0ZJI5YIk0nflGI7SQsfl2ljihVy7ogh7DeQSeYAUi0ubZ/yEueGtDfUPk6GH5LRw1hBdLq4IwUBWA== retry@0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= rimraf@2.6.3: version "2.6.3" @@ -3822,6 +3276,13 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + run-async@^2.2.0: version "2.4.1" resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz" @@ -3839,11 +3300,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -<<<<<<< HEAD "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: -======= -safer-buffer@^2.0.2, safer-buffer@^2.1.0, "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@~2.1.0: ->>>>>>> integrate toolkit v1 version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -3853,20 +3310,15 @@ semver@^5.5.0, semver@^5.6.0: resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^7.2.1: - version "7.3.2" - resolved "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@^7.3.2: +semver@^7.2.1, semver@^7.3.2: version "7.3.2" resolved "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== semver@^7.5.0: - version "7.5.1" - resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz" - integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== + version "7.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" + integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== dependencies: lru-cache "^6.0.0" @@ -3880,7 +3332,7 @@ serialize-javascript@6.0.0: shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= dependencies: shebang-regex "^1.0.0" @@ -3894,7 +3346,7 @@ shebang-command@^2.0.0: shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= shebang-regex@^3.0.0: version "3.0.0" @@ -3906,6 +3358,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= + slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz" @@ -3915,11 +3372,6 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -slice-ansi@0.0.4: - version "0.0.4" - resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz" - integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw== - source-map-support@^0.5.19: version "0.5.19" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" @@ -3935,11 +3387,7 @@ source-map@^0.6.0: sparse-array@^1.3.1: version "1.3.2" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/sparse-array/-/sparse-array-1.3.2.tgz#0e1a8b71706d356bc916fe754ff496d450ec20b0" -======= - resolved "https://registry.npmjs.org/sparse-array/-/sparse-array-1.3.2.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-ZT711fePGn3+kQyLuv1fpd3rNSkNF8vd5Kv2D+qnOANeyKs3fx6bUMGWRPvgTTcYV64QMqZKZwcuaQSP3AZ0tg== split-ca@^1.0.1: @@ -3950,7 +3398,7 @@ split-ca@^1.0.1: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= ssh2@^1.11.0: version "1.11.0" @@ -3980,51 +3428,26 @@ sshpk@^1.7.0: stream-to-it@^0.2.2: version "0.2.4" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/stream-to-it/-/stream-to-it-0.2.4.tgz#d2fd7bfbd4a899b4c0d6a7e6a533723af5749bd0" -======= - resolved "https://registry.npmjs.org/stream-to-it/-/stream-to-it-0.2.4.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-4vEbkSs83OahpmBybNJXlJd7d6/RxzkkSdT3I0mnGt79Xd2Kk+e1JqbvAvsQfCeKj3aKb0QIWkyK3/n0j506vQ== dependencies: get-iterator "^1.0.2" streamsearch@^1.1.0: version "1.1.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== -======= - resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" - integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - ->>>>>>> integrate toolkit v1 string-width@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.1.0: - version "2.1.1" - resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^2.1.1: +string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -4041,7 +3464,7 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -4050,17 +3473,33 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= dependencies: ansi-regex "^3.0.0" @@ -4088,17 +3527,24 @@ strip-ansi@^6.0.1: strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= -strip-json-comments@^3.1.0, strip-json-comments@3.1.1: +strip-json-comments@3.1.1, strip-json-comments@^3.1.0: version "3.1.1" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= supports-color@^5.3.0: version "5.5.0" @@ -4114,13 +3560,6 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz" @@ -4170,19 +3609,12 @@ tar-stream@^2.0.0: text-table@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= through@^2.3.6: version "2.3.8" resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - -timeout-abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/timeout-abort-controller/-/timeout-abort-controller-3.0.0.tgz" - integrity sha512-O3e+2B8BKrQxU2YRyEjC/2yFdb33slI22WRdUaDx6rvysfi9anloNZyR2q0l6LnePo5qH7gSM7uZtvvwZbc2yA== - dependencies: - retimer "^3.0.0" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= timeout-abort-controller@^3.0.0: version "3.0.0" @@ -4257,11 +3689,6 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== -tslib@2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tsutils@^3.17.1: version "3.17.1" resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz" @@ -4272,14 +3699,14 @@ tsutils@^3.17.1: tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -4303,42 +3730,28 @@ type-fest@^0.8.1: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -typescript@^4.7.3, typescript@>=2.7, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta": +typescript@^4.7.3: version "4.7.3" resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== uint8arraylist@^2.1.2, uint8arraylist@^2.4.3: version "2.4.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/uint8arraylist/-/uint8arraylist-2.4.3.tgz#1148aa979b407d382e4eb8d9c8f2b4bf3f5910d5" -======= - resolved "https://registry.npmjs.org/uint8arraylist/-/uint8arraylist-2.4.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-oEVZr4/GrH87K0kjNce6z8pSCzLEPqHNLNR5sj8cJOySrTP8Vb/pMIbZKLJGhQKxm1TiZ31atNrpn820Pyqpow== dependencies: uint8arrays "^4.0.2" uint8arrays@^4.0.2: version "4.0.3" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-4.0.3.tgz#43109c03c4c10d312e7f2e9f4d53e5cd2398c7fd" -======= - resolved "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.3.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-b+aKlI2oTnxnfeSQWV1sMacqSNxqhtXySaH6bflvONGxF8V/fT3ZlYH7z2qgGfydsvpVo4JUgM/Ylyfl2YouCg== dependencies: multiformats "^11.0.0" -<<<<<<< HEAD undici@^5.12.0: version "5.22.1" resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b" -======= -undici@*, undici@^5.12.0: - version "5.22.1" - resolved "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw== dependencies: busboy "^1.6.0" @@ -4365,7 +3778,7 @@ uri-js@^4.2.2: util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= uuid@^3.3.2: version "3.4.0" @@ -4384,17 +3797,13 @@ v8-compile-cache@^2.0.3: varint@^6.0.0: version "6.0.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" -======= - resolved "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== verror@1.10.0: version "1.10.0" resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -4447,7 +3856,7 @@ workerpool@6.2.1: wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz" - integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ== + integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= dependencies: string-width "^2.1.1" strip-ansi "^4.0.0" @@ -4464,7 +3873,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= write@1.0.3: version "1.0.3" @@ -4475,11 +3884,7 @@ write@1.0.3: ws@8.5.0: version "8.5.0" -<<<<<<< HEAD resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" -======= - resolved "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz" ->>>>>>> integrate toolkit v1 integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== y18n@^5.0.5: @@ -4489,27 +3894,24 @@ y18n@^5.0.5: yallist@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^2.2.2: -<<<<<<< HEAD version "2.3.0" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.0.tgz#47ebe58ee718f772ce65862beb1db816210589a0" integrity sha512-8/1wgzdKc7bc9E6my5wZjmdavHLvO/QOmLG1FBugblEvY4IXrLjlViIOmL24HthU042lWTDRO90Fz1Yp66UnMw== yargs-parser@20.2.4: -======= - version "2.2.2" - resolved "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz" - integrity sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA== - -yargs-parser@^20.2.2, yargs-parser@20.2.4: ->>>>>>> integrate toolkit v1 version "20.2.4" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" @@ -4525,19 +3927,6 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@^17.7.1: - version "17.7.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yargs@16.2.0: version "16.2.0" resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" @@ -4551,6 +3940,19 @@ yargs@16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.7.1: + version "17.7.1" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz" + integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yn@3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz" @@ -4559,4 +3961,4 @@ yn@3.1.1: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file From 3fb00143ee176ad1bd12dae8af82ea63a6a9e2bb Mon Sep 17 00:00:00 2001 From: Marc Font Date: Wed, 24 May 2023 13:40:27 +0200 Subject: [PATCH 5/6] ordering --- src/tasks/generatePublishTx.ts | 3 +-- src/utils/verifyEthConnection.ts | 2 +- src/utils/versions/getNextVersionFromApm.ts | 2 +- test/utils/{Apm.test.ts => resolve.test.ts} | 5 +---- 4 files changed, 4 insertions(+), 8 deletions(-) rename test/utils/{Apm.test.ts => resolve.test.ts} (90%) diff --git a/src/tasks/generatePublishTx.ts b/src/tasks/generatePublishTx.ts index ad547254..1b0abf78 100644 --- a/src/tasks/generatePublishTx.ts +++ b/src/tasks/generatePublishTx.ts @@ -5,9 +5,9 @@ import { addReleaseTx } from "../utils/releaseRecord.js"; import { defaultDir, YargsError } from "../params.js"; import { CliGlobalOptions, ListrContextBuildAndPublish } from "../types.js"; import { readManifest } from "../files/index.js"; -import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; import registryAbi from "../contracts/ApmRegistryAbi.json" assert { type: "json" }; import { semverToArray } from "../utils/semverToArray.js"; +import repoAbi from "../contracts/RepoAbi.json" assert { type: "json" }; import { getEthereumUrl } from "../utils/getEthereumUrl.js"; const isZeroAddress = (address: string): boolean => parseInt(address) === 0; @@ -36,7 +36,6 @@ export function generatePublishTx({ ethProvider: string; } & CliGlobalOptions): Listr { - // const provider = new ethers.JsonRpcProvider(getEthereumUrl(ethProvider)) // Load manifest ##### Verify manifest object diff --git a/src/utils/verifyEthConnection.ts b/src/utils/verifyEthConnection.ts index a8c4bb31..07c3205e 100644 --- a/src/utils/verifyEthConnection.ts +++ b/src/utils/verifyEthConnection.ts @@ -28,4 +28,4 @@ export async function verifyEthConnection(ethProvider: string): Promise { throw new CliError(`Could not reach ETH provider at ${ethProvider}`); } } -} \ No newline at end of file +} diff --git a/src/utils/versions/getNextVersionFromApm.ts b/src/utils/versions/getNextVersionFromApm.ts index cc18758e..060d4d04 100644 --- a/src/utils/versions/getNextVersionFromApm.ts +++ b/src/utils/versions/getNextVersionFromApm.ts @@ -38,4 +38,4 @@ export async function getNextVersionFromApm({ ); return nextVersion; -} \ No newline at end of file +} diff --git a/test/utils/Apm.test.ts b/test/utils/resolve.test.ts similarity index 90% rename from test/utils/Apm.test.ts rename to test/utils/resolve.test.ts index 99f6f295..3fd400ec 100644 --- a/test/utils/Apm.test.ts +++ b/test/utils/resolve.test.ts @@ -7,11 +7,10 @@ describe("Apm constructor", function () { this.timeout(60_000); const dnpName = "admin.dnp.dappnode.eth"; + const parsedProvider = new ethers.JsonRpcProvider(getEthereumUrl("infura")) it("Should get the contract the registry contract of a DNP name", async () => { - const parsedProvider = new ethers.JsonRpcProvider(getEthereumUrl("infura")) const registry = await parsedProvider.resolveName(dnpName.split(".").slice(1).join(".")) - if (!registry) throw Error("no registry"); expect(registry).to.be.a("string", "Contract instance changed"); expect((registry).toLowerCase()).to.equal( @@ -20,9 +19,7 @@ describe("Apm constructor", function () { }); it("Should get the contract the repo contract of a DNP name", async () => { - const parsedProvider = new ethers.JsonRpcProvider(getEthereumUrl("infura")) const repo = await parsedProvider.resolveName(dnpName) - if (!repo) throw Error("no repo"); expect(repo).to.be.a("string", "Contract instance changed"); expect(repo.toLowerCase()).to.equal( From cab84556e253457b657fad73c3c48238ba90c767 Mon Sep 17 00:00:00 2001 From: Marc Font Date: Wed, 24 May 2023 14:42:47 +0200 Subject: [PATCH 6/6] delete duplicated toolkit --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index d2eb392b..dbb0c9e4 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ }, "homepage": "https://github.com/dappnode/DAppNodeSDK#readme", "dependencies": { - "@dappnode/toolkit": "0.1.12", "@dappnode/schemas": "^0.1.6", "@dappnode/toolkit": "^0.1.18", "@dappnode/types": "^0.1.12",